Bugzilla – Attachment 152123 Details for
Bug 33909
Improve translation of title tags: Administration
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33909: Improve translation of title tags: Administration
Bug-33909-Improve-translation-of-title-tags-Admini.patch (text/plain), 80.06 KB, created by
Owen Leonard
on 2023-06-07 17:15:29 UTC
(
hide
)
Description:
Bug 33909: Improve translation of title tags: Administration
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-06-07 17:15:29 UTC
Size:
80.06 KB
patch
obsolete
>From 314ccfc4ac445ffab12495dd55727cbc2f760cea Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 6 Jun 2023 15:04:43 +0000 >Subject: [PATCH] Bug 33909: Improve translation of title tags: Administration > >This patch updates administration templates so that title tags can be >more easily translated. > >To test, apply the patch and confirm that the following >Administration pages have the correct title tags: > > - Libraries > - Library groups > - Item types > - Authorized values > - Patron categories > - Circulation and fines rules > - Patron attribute types > - Library transfer limits > - Library transfer limits advanced editor > - Transport cost matrix > - Item circulation alerts > - Cities and towns > - Curbside pickup > - Patron restriction types > - Debit types > - Credit types > - Cash registers > - Manage plugins > - Manage jobs > - MARC bibliographic framework > - Koha to MARC mapping > - MARC Bibliographic framework test > - Authority types > - Classification configuration > - Record matching rules > - Record overlay rules > - OAI sets configuration > - Item search fields > - Search engine configuration > - Currencies and exchange rates > - Budgets > - Funds > - EDI accounts > - Library EANs > - Network Printers > - Identity providers > - Z39.50/SRU servers > - SMTP servers > - Did you mean? > - Table settings > - Audio alerts > - Share your usage statistics > - Share content with Mana KB > - Additional fields > - Keyboard shortcuts >--- > .../en/modules/admin/additional-fields.tt | 19 +++++-- > .../prog/en/modules/admin/admin-home.tt | 7 ++- > .../en/modules/admin/adveditorshortcuts.tt | 7 ++- > .../prog/en/modules/admin/aqbudgetperiods.tt | 40 ++++++------- > .../prog/en/modules/admin/aqbudgets.tt | 18 +++++- > .../prog/en/modules/admin/aqcontract.tt | 37 ++++++++---- > .../prog/en/modules/admin/aqplan.tt | 9 ++- > .../prog/en/modules/admin/audio_alerts.tt | 7 ++- > .../modules/admin/auth_subfields_structure.tt | 7 ++- > .../en/modules/admin/auth_tag_structure.tt | 54 +++++++++++------- > .../en/modules/admin/authorised_values.tt | 23 +++++--- > .../prog/en/modules/admin/authtypes.tt | 25 +++++---- > .../prog/en/modules/admin/background_jobs.tt | 12 ++-- > .../prog/en/modules/admin/biblio_framework.tt | 25 +++++---- > .../modules/admin/branch_transfer_limits.tt | 7 ++- > .../prog/en/modules/admin/branches.tt | 27 +++++---- > .../prog/en/modules/admin/cash_registers.tt | 25 +++++---- > .../prog/en/modules/admin/categories.tt | 19 ++++--- > .../prog/en/modules/admin/checkmarc.tt | 12 +++- > .../prog/en/modules/admin/cities.tt | 6 +- > .../prog/en/modules/admin/classsources.tt | 44 ++++++++------- > .../prog/en/modules/admin/clone-rules.tt | 8 ++- > .../prog/en/modules/admin/columns_settings.tt | 7 ++- > .../prog/en/modules/admin/credit_types.tt | 17 +++--- > .../prog/en/modules/admin/curbside_pickup.tt | 10 ++-- > .../prog/en/modules/admin/currency.tt | 24 ++++++-- > .../prog/en/modules/admin/debit_types.tt | 16 ++++-- > .../prog/en/modules/admin/desks.tt | 19 ++++--- > .../prog/en/modules/admin/didyoumean.tt | 7 ++- > .../prog/en/modules/admin/edi_accounts.tt | 26 +++++---- > .../prog/en/modules/admin/edi_ean_accounts.tt | 27 +++++---- > .../admin/identity_provider_domains.tt | 16 ++++-- > .../en/modules/admin/identity_providers.tt | 16 ++++-- > .../modules/admin/item_circulation_alerts.tt | 7 ++- > .../en/modules/admin/items_search_field.tt | 9 ++- > .../en/modules/admin/items_search_fields.tt | 7 ++- > .../prog/en/modules/admin/itemtypes.tt | 40 +++++++------ > .../prog/en/modules/admin/koha2marclinks.tt | 7 ++- > .../prog/en/modules/admin/library_groups.tt | 7 ++- > .../prog/en/modules/admin/localization.tt | 6 +- > .../en/modules/admin/marc-overlay-rules.tt | 9 ++- > .../modules/admin/marc_subfields_structure.tt | 56 +++++++++---------- > .../prog/en/modules/admin/marctagstructure.tt | 34 ++++++----- > .../prog/en/modules/admin/matching-rules.tt | 20 ++++--- > .../prog/en/modules/admin/oai_set_mappings.tt | 8 ++- > .../prog/en/modules/admin/oai_sets.tt | 12 ++-- > .../prog/en/modules/admin/overdrive.tt | 7 ++- > .../en/modules/admin/patron-attr-types.tt | 28 ++++++---- > .../prog/en/modules/admin/preferences.tt | 7 ++- > .../prog/en/modules/admin/restrictions.tt | 18 +++++- > .../prog/en/modules/admin/search_filters.tt | 9 ++- > .../searchengine/elasticsearch/mappings.tt | 6 +- > .../prog/en/modules/admin/share_content.tt | 9 ++- > .../prog/en/modules/admin/smart-rules.tt | 7 ++- > .../prog/en/modules/admin/sms_providers.tt | 7 ++- > .../prog/en/modules/admin/smtp_servers.tt | 16 ++++-- > .../prog/en/modules/admin/sru_modmapping.tt | 6 +- > .../en/modules/admin/sru_modmapping_auth.tt | 6 +- > .../en/modules/admin/systempreferences.tt | 29 +++++----- > .../prog/en/modules/admin/transfer_limits.tt | 7 ++- > .../en/modules/admin/transport-cost-matrix.tt | 7 ++- > .../prog/en/modules/admin/usage_statistics.tt | 7 ++- > .../prog/en/modules/admin/z3950servers.tt | 36 ++++++------ > 63 files changed, 695 insertions(+), 362 deletions(-) > >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 be9e60b569..5cf37a98e2 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 >@@ -1,13 +1,22 @@ > [% USE AuthorisedValues %] > [% USE raw %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% SWITCH op %] >- [% CASE 'add_form' %][% IF field %]Modify additional field '[% field.name | html %]'[% ELSE %]Add additional field[% END %] >- [% CASE %]Manage additional fields >- [% END %] › Administration › Koha >-</title> >+ [% CASE 'add_form' %] >+ [% IF field %] >+ [% tx("Modify additional field '{field_name}'", { field_name = field.name }) | html %] >+ [% ELSE %] >+ [% t("Add additional field") | html %] >+ [% END %] >+ [% CASE %] >+ [% t("Manage additional fields") | html %] >+ [% END %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 47b2142fea..b429d6b99a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >@@ -1,9 +1,12 @@ >- > [% USE raw %] > [% USE Koha %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="admin_admin-home" class="admin"> >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 85784a2e84..4b8428e395 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt >@@ -1,9 +1,14 @@ > [% USE raw %] > [% USE Asset %] > [% USE Koha %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Advanced editor shortcuts › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Advanced editor shortcuts") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="adveditor_shortcuts" class="admin"> >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 d439db6dfb..2a90106dc3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt >@@ -2,6 +2,7 @@ > [% USE Asset %] > [% USE KohaDates %] > [% USE Price %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [%- BLOCK action_menu %] > <div class="btn-group dropup"> >@@ -40,34 +41,33 @@ > [% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") | $raw %] > [% END %] > >-<title> >+<title>[% FILTER collapse %] > [% IF ( add_form ) %] > [% IF ( budget_period_id ) %] >- Modify budget [% budget_period_description | html %] >+ [% tx("Modify budget {budget_period_description}", { budget_period_description = budget_period_description }) | html %] > [% ELSE %] >- Add budget >- [% END %] › [% END %] >- >+ [% t("Add budget") | html %] >+ [% END %] › >+ [% END %] > [% IF ( duplicate_form ) %] >- Duplicate budget › [% END %] >- >+ [% t("Duplicate budget") | html %] › >+ [% END %] > [% IF ( delete_confirm ) %] >- Delete budget '[% budget_period_description | html %]'? › [% END %] >- >+ [% tx("Delete budget '{budget_period_description}'?", { budget_period_description = budget_period_description }) | html %] › >+ [% END %] > [% IF ( delete_confirmed ) %] >- Data deleted › [% END %] >- >+ [% t("Data deleted") | html %] › >+ [% END %] > [% IF close_form %] >- Close budget [% budget_period_description | html %] › [% END %] >- >+ [% tx("Close budget {budget_period_description}", { budget_period_description = budget_period_description }) | html %] › >+ [% END %] > [% IF closed %] >- Budget [% budget_period_description | html %] closed › [% END %] >- >- Budgets › Administration › Koha >- >-</title> >- >- >+ [% tx("Budget {budget_period_description} closed", { budget_period_description = budget_period_description }) | html %] › >+ [% END %] >+ [% t("Budgets") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > </head> > > <body id="admin_aqbudgetperiods" class="admin"> >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 6e0bf42f24..0d3519104e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt >@@ -3,10 +3,26 @@ > [% USE AuthorisedValues %] > [% USE Branches %] > [% USE Price %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > >-<title>[% IF op == 'add_form' %][% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name | html %]'[% END %][% ELSE %]Add fund[% END %] ›[% END %] Funds › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% IF op == 'add_form' %] >+ [% IF ( budget_id ) %] >+ [% IF ( budget_name ) %] >+ [% tx("Modify fund '{fund_name}'", { fund_name = budget_name }) | html %] >+ [% ELSE %] >+ [% t("Modify fund") | html %] >+ [% END %] >+ [% ELSE %] >+ [% t("Add fund") | html %] >+ [% END %] › >+ [% END %] >+ [% t("Funds") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") | $raw %] > [% INCLUDE 'doc-head-close.inc' %] > </head> >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 91435a27a4..dd931cc784 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt >@@ -1,22 +1,37 @@ > [% USE raw %] > [% USE Asset %] > [% USE KohaDates %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >-[% IF ( add_form ) %] >- [% IF ( contractnumber ) %]Modify contract '[% contractname | html %]' >-[% ELSE %]New contract[% END %] >-[% END %] >-[% IF ( else ) %]Contracts of [% booksellername | html %][% END %] >-[% IF ( add_validate ) %]Data recorded[% END %] >-[% IF ( delete_confirm ) %]Confirm deletion of contract '[% contractnumber | html %]'[% END %] >-[% IF ( delete_confirmed ) %]Contract deleted[% END %] >- › Contracts › Acquisitions › Koha >-</title> >+<title>[% FILTER collapse %] >+ [% IF ( add_form ) %] >+ [% IF ( contractnumber ) %] >+ [% tx("Modify contract {contractname}", { contractname = contractname }) | html %] >+ [% ELSE %] >+ [% t("New contract") | html %] >+ [% END %] >+ [% END %] >+ [% IF ( else ) %] >+ [% tx("Contracts of {vendor}", { vendor = booksellername }) | html %] >+ [% END %] >+ [% IF ( add_validate ) %] >+ [% t("Data recorded") | html %] >+ [% END %] >+ [% IF ( delete_confirm ) %] >+ [% tx("Confirm deletion of contract '{contractnumber}'", { contractnumber = contractnumber }) | html %] >+ [% END %] >+ [% IF ( delete_confirmed ) %] >+ [% t("Contract deleted") | html %] >+ [% END %] › >+ [% t("Contracts") | html %] › >+ [% t("Acquisitions") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >+ > <body id="acq_aqcontract" class="acq"> > [% WRAPPER 'header.inc' %] > [% INCLUDE 'contracts-admin-search.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 22a1eca100..7bfdd01129 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt >@@ -1,10 +1,17 @@ > [% USE raw %] > [% USE Asset %] > [% USE Price %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > [% PROCESS 'budget_planning.inc' %] >-<title>Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %] › Funds › Budgets › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% tx("Planning for {fund}", { fund = budget_period_description }) | html %][% PROCESS planning plan=authcat %] › >+ [% t("Funds") | html %] › >+ [% t("Budgets") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style>td.locked { background-image: url('[% interface | html %]/[% theme | html %]/img/locked.png'); padding-left : 20px; background-repeat: no-repeat; background-position: 5px 5px; } a.control { font-size:85%;text-decoration:none; } .plan_entry { text-align: right; width:90%; }</style> > </head> >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 02f6d1bba4..ab7f182c4f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt >@@ -1,9 +1,14 @@ > [% USE raw %] > [% USE Asset %] > [% USE Koha %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Audio alerts › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Audio alerts") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 677177e836..899d967f80 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt >@@ -1,8 +1,13 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Authority MARC subfield structure › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Authority MARC subfield structure") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 c97d5c62e9..a72337014a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt >@@ -1,38 +1,52 @@ > [% USE raw %] > [% USE Asset %] > [% USE AuthorisedValues %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% IF ( add_form ) %] > [% IF ( use_heading_flags_p ) %] > [% IF ( heading_modify_tag_p ) %] >- Modify tag › [% IF ( authtypecode ) %] >- [% authtypecode | html %] Framework >+ [% t("Modify tag ") | html %] › >+ [% IF ( authtypecode ) %] >+ [% tx("{authtypecode} framework", { authtypecode = authtypecode }) | html %] > [% ELSE %] >- Default framework >- [% END %] › [% END %] >+ [% t("Default framework") | html %] >+ [% END %] › >+ [% END %] > [% IF ( heading_add_tag_p ) %] >- New tag › [% IF ( authtypecode ) %] >- [% authtypecode | html %] Framework >+ [% t("New tag") | html %] › >+ [% IF ( authtypecode ) %] >+ [% tx("{authtypecode} framework", { authtypecode = authtypecode }) | html %] > [% ELSE %] >- Default framework >- [% END %] › [% END %] >+ [% t("Default framework") | html %] >+ [% END %] › >+ [% END %] > [% ELSE %] >- [% action | html %] › [% END %] >+ [% action | html %] › >+ [% END %] > [% END %] > [% IF ( delete_confirm ) %] >- Confirm deletion › [% IF ( authtypecode ) %] >- [% authtypecode | html %] Framework >- [% ELSE %]Default framework >- [% END %] › [% END %] >+ [% t("Confirm deletion") | html %] › >+ [% IF ( authtypecode ) %] >+ [% tx("{authtypecode} framework", { authtypecode = authtypecode }) | html %] >+ [% ELSE %] >+ [% t("Default framework") | html %] >+ [% END %] › >+ [% END %] > [% IF ( delete_confirmed ) %] >- Data deleted › [% IF ( authtypecode ) %] >- [% authtypecode | html %] Framework >- [% ELSE %]Default framework >- [% END %] › [% END %] >-Authority MARC framework › Administration › Koha >-</title> >+ [% t("Data deleted") | html %] › >+ [% IF ( authtypecode ) %] >+ [% tx("{authtypecode} framework", { authtypecode = authtypecode }) | html %] >+ [% ELSE %] >+ [% t("Default framework") | html %] >+ [% END %] › >+ [% END %] >+ [% t("Authority MARC framework") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > > </head> >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 600c03c381..68d14a63aa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt >@@ -1,18 +1,27 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% IF op == 'add_form' %] >- [% IF ( action_modify ) %]Modify authorized value › [% END %] >- [% IF ( action_add_value ) %]New authorized value › [% END %] >- [% IF ( action_add_category ) %]New category › [% END %] >+ [% IF ( action_modify ) %] >+ [% t("Modify authorized value") | html %] › >+ [% END %] >+ [% IF ( action_add_value ) %] >+ [% t("New authorized value") | html %] › >+ [% END %] >+ [% IF ( action_add_category ) %] >+ [% t("New category") | html %] › >+ [% END %] > [% IF ( action_modify || action_add_value ) %] >- Authorized values for category [% category_name | html %] › >+ [% tx("Authorized values for category {category_name}", { category_name = category_name }) | html %] › > [% END %] > [% END %] >- Authorized values › Administration › Koha >-</title> >+ [% t("Authorized values") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > > [% FILTER collapse %] >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 6afbb9d8f1..7a89dcb467 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt >@@ -1,17 +1,22 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >-[% IF op == 'add_form' %] >- [% IF authority_type.authtypecode.defined %] >- Modify authority type >- [% ELSE %] >- New authority type >- [% END %] › [% ELSIF op == 'delete_confirm' %] >- Confirm deletion of authority type › [% END %] >-Authority types › Administration › Koha >-</title> >+<title>[% FILTER collapse %] >+ [% IF op == 'add_form' %] >+ [% IF authority_type.authtypecode.defined %] >+ [% t("Modify authority type") | html %] >+ [% ELSE %] >+ [% t("New authority type") | html %] >+ [% END %] › >+ [% ELSIF op == 'delete_confirm' %] >+ [% t("Confirm deletion of authority type") | html %] › >+ [% END %] >+ [% t("Authority types") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 bfc291d3d8..22849755c1 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 >@@ -2,15 +2,17 @@ > [% USE KohaDates %] > [% USE Asset %] > [% USE KohaDates %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% IF op == 'view' %] >- Details of job #[% job.id | html %] › >+ [% tx("Details of job #{job_id}", { job_id = job.id }) | html %] › > [% END %] >- Jobs › >- Administration › Koha >-</title> >+ [% t("Jobs") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > > [% INCLUDE 'doc-head-close.inc' %] > </head> >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 0a709984e6..9ed3cb9508 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt >@@ -1,17 +1,22 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >-[% IF op == 'add_form' %] >- [% IF framework %] >- Modify framework text >- [% ELSE %] >- Add framework >- [% END %] › [% ELSIF op == 'delete_confirm' %] >- Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])? › [% END %] >-MARC frameworks › Administration › Koha >-</title> >+<title>[% FILTER collapse %] >+ [% IF op == 'add_form' %] >+ [% IF framework %] >+ [% t("Modify framework text") | html %] >+ [% ELSE %] >+ [% t("Add framework") | html %] >+ [% END %] › >+ [% ELSIF op == 'delete_confirm' %] >+ [% tx("Delete framework for {framework} ({frameworkcode})?", { framework = framework.frameworktext, frameworkcode = framework.frameworkcode }) | html %] › >+ [% END %] >+ [% t("MARC frameworks") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 00f340f70a..1cd0518df4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt >@@ -1,9 +1,14 @@ > [% USE raw %] > [% USE Asset %] > [% USE Branches %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Library checkin and transfer policy › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Library checkin and transfer policy") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style>td { text-align: center; } .sorted { min-width: 50%; }</style> > </head> >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 a6aa3fe5fd..fcada7075e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt >@@ -1,22 +1,27 @@ > [% USE Koha %] > [% USE raw %] > [% USE Asset %] >-[% SET footerjs = 1 %] > [% USE TablesSettings %] > [%- USE KohaSpan -%] >+[% PROCESS 'i18n.inc' %] >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > [% IF library %][% SET OpacLibraryInfo = library.opac_info( lang => lang ) %][% END %] > >-<title> >-[% IF op == 'add_form' %] >- [% IF library %] >- Modify library >- [% ELSE %] >- New library [% library.branchcode | html %] >- [% END %] › [% ELSIF op == 'delete_confirm' %] >- Confirm deletion of library '[% library.branchcode | html %]' › [% END %] >-Libraries › Administration › Koha >-</title> >+<title>[% FILTER collapse %] >+ [% IF op == 'add_form' %] >+ [% IF library %] >+ [% t("Modify library") | html %] >+ [% ELSE %] >+ [% tx("New library {library}", { library = library.branchcode }) | html %] >+ [% END %] › >+ [% ELSIF op == 'delete_confirm' %] >+ [% tx("Confirm deletion of library '{library}'", { library = library.branchcode }) | html %] › >+ [% END %] >+ [% t("Libraries") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 00dfa35f4f..83d8f51cf0 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 >@@ -2,18 +2,23 @@ > [% USE Asset %] > [% USE Branches %] > [% USE Price %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >-[% IF op == 'add_form' %] >- [% IF cash_register %] >- Modify cash register >- [% ELSE %] >- New cash register [% cash_register.id | html %] >- [% END %] › [% ELSIF op == 'delete_confirm' %] >- Confirm deletion of cash register '[% cash_register.id | html %]' › [% END %] >-Cash registers › Administration › Koha >-</title> >+<title>[% FILTER collapse %] >+ [% IF op == 'add_form' %] >+ [% IF cash_register %] >+ [% tx("Modify cash register {cash_register}", { cash_register = cash_register.id }) | html %] >+ [% ELSE %] >+ [% t("New cash register") | html %] >+ [% END %] › >+ [% ELSIF op == 'delete_confirm' %] >+ [% tx("Confirm deletion of cash register '{cash_register}'", { cash_register = cash_register.id }) | html %] › >+ [% END %] >+ [% t("Cash registers") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 b67341044a..4604800edb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt >@@ -5,26 +5,27 @@ > [% USE KohaDates %] > [% USE Price %] > [% USE TablesSettings %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% FILTER collapse %] > [% IF op == 'add_form' %] > [% IF ( categorycode ) %] >- Modify category '[% categorycode | html %]' >+ [% tx("Modify category '{categorycode}'", { categorycode = categorycode }) | html %] > [% ELSE %] >- New category >- [% END %] >- › >+ [% t("New category") | html %] >+ [% END %] › > [% END %] > [% IF op == 'delete_confirm' %] > [% IF ( patrons_in_category > 0 ) %] >- Cannot delete: category [% categorycode | html %] in use >+ [% tx("Cannot delete: category '{categorycode}'", { categorycode = categorycode }) | html %] > [% ELSE %] >- Confirm deletion of category '[% categorycode | html %]' >- [% END %] >- › >+ [% tx("Confirm deletion of category '{categorycode}'", { categorycode = categorycode }) | html %] >+ [% END %] › > [% END %] >- Patron categories › Administration › Koha >+ [% t("Patron categories") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] > [% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style>#enrolmentmessage.hint { display : none; }</style> >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 9c7ac05c9f..e4040beb31 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt >@@ -1,9 +1,17 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>MARC check >-[% IF ( total ) %] :[% total | html %] errors found[% ELSE %] : Configuration OK![% END %] › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% IF ( total ) %] >+ [% tx("MARC check: {total} errors found", { total = total }) | html %] >+ [% ELSE %] >+ [% t("MARC check: Configuration OK!") | html %] >+ [% END %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="admin_checkmarc" class="admin"> >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 90e4e528a0..a87f46ce54 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt >@@ -1,8 +1,8 @@ > [% USE raw %] > [% USE Asset %] >-[% SET footerjs = 1 %] > [% USE TablesSettings %] > [% PROCESS 'i18n.inc' %] >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > <title>[% FILTER collapse %] > [% IF op =='add_form' %] >@@ -16,7 +16,9 @@ > [% t("Confirm deletion of city") | html %] › > [% END %] > [% END %] >- [% t("Cities") | html %] › [% t("Administration") | html %] › [% t("Koha") | html %] >+ [% t("Cities") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] > [% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >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 74dd4047ca..65195479d8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt >@@ -1,26 +1,32 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >-[% IF op == 'add_source' %] >- [% IF class_source %] >- Modify classification source >- [% ELSE %] >- Add classification source >- [% END %] › [% ELSIF op == 'add_sort_rule' %] >- [% IF sort_rule %] >- Modify filing rule >- [% ELSE %] >- Add filing rule >- [% END %] › [% ELSIF op == 'add_split_rule' %] >- [% IF split_rule %] >- Modify splitting rule >- [% ELSE %] >- Add splitting rule >- [% END %] › [% END %] >-Classification sources › Administration › Koha >-</title> >+<title>[% FILTER collapse %] >+ [% IF op == 'add_source' %] >+ [% IF class_source %] >+ [% t("Modify classification source") | html %] >+ [% ELSE %] >+ [% t("Add classification source") | html %] >+ [% END %] › >+ [% ELSIF op == 'add_sort_rule' %] >+ [% IF sort_rule %] >+ [% t("Modify filing rule") | html %] >+ [% ELSE %] >+ [% t("Add filing rule") | html %] >+ [% END %] › >+ [% ELSIF op == 'add_split_rule' %] >+ [% IF split_rule %] >+ [% t("Modify splitting rule") | html %] >+ [% ELSE %] >+ [% t("Add splitting rule") | html %] >+ [% END %] › >+ [% END %] >+ [% t("Classification sources") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > #button_add, >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 909ff774e3..ecc7b3b0db 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt >@@ -1,9 +1,15 @@ > [% USE raw %] > [% USE Asset %] > [% USE Branches %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Clone circulation and fine rules › Circulation and fine rules › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Clone circulation and fine rules") | html %] › >+ [% t("Circulation and fine rules") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="admin_clone-rules" class="admin"> >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 bd8c826f27..80780fc55a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt >@@ -1,6 +1,7 @@ > [% USE raw %] > [% USE Asset %] > [% USE TablesSettings %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% BLOCK pagelist %] > [% IF module.keys and module.keys.size > 0 %] >@@ -154,7 +155,11 @@ > [% END %] > > [% INCLUDE 'doc-head-open.inc' %] >-<title>Table settings › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Table settings") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > caption { >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 2eb8f443b0..dc045f285b 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 >@@ -1,21 +1,24 @@ > [% USE raw %] > [% USE Asset %] > [% USE Branches %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% PROCESS 'accounts.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% IF op =='add_form' %] >- Credit types › > [% IF credit_type.code %] >- Modify credit type >+ [% t("Modify credit type") | html %] › > [% ELSE %] >- New credit type >+ [% t("New credit type") | html %] › > [% END %] >+ [% t("Credit types") | html %] > [% ELSE %] >- Credit types >- [% END %] › Administration › Koha >-</title> >+ [% t("Credit types") | html %] >+ [% END %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 5d345ddc25..3339ae43c3 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 >@@ -2,13 +2,15 @@ > [% USE KohaSpan %] > [% USE Koha %] > [% USE Asset %] >-[% SET footerjs = 1 %] > [% USE TablesSettings %] > [% PROCESS 'i18n.inc' %] >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >- Curbside pickup › Administration › Koha >-</title> >+<title>[% FILTER collapse %] >+ [% t("Curbside pickup") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > .pickup-slot { >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 c98872a0c5..4db076bd29 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt >@@ -3,12 +3,28 @@ > [% USE KohaDates %] > [% USE TablesSettings %] > [% USE HtmlTags %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% IF op == 'add_form' %][% IF currency %]Modify currency '[% currency.currency | html %]'[% ELSE %]New currency[% END %][% END %] >-[% IF op == 'delete_confirm' %]Confirm deletion of currency '[% currency.currency | html %]'[% END %] >-[% IF op == 'list' %]Currencies[% END %] › Currencies & Exchange rates › Administration › Koha >-</title> >+<title>[% FILTER collapse %] >+ [% IF op == 'add_form' %] >+ [% IF currency %] >+ [% tx("Modify currency '{currency}'", { currency = currency.currency }) | html %] >+ [% ELSE %] >+ [% t("New currency") | html %] >+ [% END %] >+ [% END %] › >+ [% IF op == 'delete_confirm' %] >+ [% tx("Confirm deletion of currency '{currency}'", { currency = currency.currency }) | html %] >+ [% END %] >+ [% IF op == 'list' %] >+ [% t("Currencies") | html %] >+ [% END %] › >+ [% t("Currencies") | html %] & >+ [% t("Exchange rates") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 0bd97fed85..ca88d92e9f 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 >@@ -2,18 +2,22 @@ > [% USE Asset %] > [% USE Branches %] > [% USE Price %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% PROCESS 'accounts.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% IF op =='add_form' %] > [% IF debit_type.code %] >- Modify debit type >+ [% t("Modify debit type") | html %] > [% ELSE %] >- New debit type >- [% END %] › [% END %] >- Debit types › Administration › Koha >-</title> >+ [% t("New debit type") | html %] >+ [% END %] › >+ [% END %] >+ [% t("Debit types") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 2804c609f6..f6148beb68 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt >@@ -1,20 +1,25 @@ > [% USE raw %] > [% USE Branches %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% IF op =='add_form' %] > [% IF desk.desk_id %] >- Modify desk >+ [% t("Modify desk") | html %] > [% ELSE %] >- New desk >- [% END %] › [% ELSE %] >+ [% t("New desk") | html %] >+ [% END %] › >+ [% ELSE %] > [% IF op == 'delete_confirm' %] >- Confirm deletion of desk › [% END %] >+ [% t("Confirm deletion of desk") | html %] › >+ [% END %] > [% END %] >- Desks › Administration › Koha >-</title> >+ [% t("Desks") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 ae0b86856e..eed01c9662 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt >@@ -1,5 +1,6 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% BLOCK pluginlist %] > <div class="pluginlist"> >@@ -23,7 +24,11 @@ > </div> > [% END %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Did you mean? › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Did you mean?") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 249b3ed25b..416e954757 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 >@@ -4,17 +4,21 @@ > [% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >-[% IF acct_form %] >- [% IF account %] >- Modify account >- [% ELSE %] >- Add new account >- [% END %] › [% END %] >-[% IF delete_confirm %] >- Confirm deletion of account › [% END %] >-EDI accounts › Administration › Koha >-</title> >+<title>[% FILTER collapse %] >+ [% IF acct_form %] >+ [% IF account %] >+ [% t("Modify account") | html %] >+ [% ELSE %] >+ [% t("Add new account") | html %] >+ [% END %] › >+ [% END %] >+ [% IF delete_confirm %] >+ [% t("Confirm deletion of account") | html %] › >+ [% END %] >+ [% t("EDI accounts") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="admin_edi_acct" class="admin"> >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 d41d8319ba..3fed8c38c3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt >@@ -1,18 +1,23 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >-[% IF ean_form %] >- [% IF ean %] >- Modify library EAN >- [% ELSE %] >- Add new library EAN >- [% END %] › [% END %] >-[% IF delete_confirm %] >- Confirm deletion of EAN › [% END %] >-Library EANs › Administration › Koha >-</title> >+<title>[% FILTER collapse %] >+ [% IF ean_form %] >+ [% IF ean %] >+ [% t("Modify library EAN") | html %] >+ [% ELSE %] >+ [% t("Add new library EAN") | html %] >+ [% END %] › >+ [% END %] >+ [% IF delete_confirm %] >+ [% t("Confirm deletion of EAN") | html %] › >+ [% END %] >+ [% t("Library EANs") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="admin_edi_ean" class="admin"> >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 65d91e1ec5..45271f39e7 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 >@@ -2,15 +2,19 @@ > [% USE Asset %] > [% USE Branches %] > [% USE Categories %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% IF op == 'add_form' %] >- New identity provider domain › [% ELSIF op == 'edit_form' %] >- Edit identity provider domain › [% END %] >- >- Identity providers › Administration › Koha >-</title> >+ [% t("New identity provider domain") | html %] › >+ [% ELSIF op == 'edit_form' %] >+ [% t("Edit identity provider domain") | html %] › >+ [% END %] >+ [% t("Identity providers") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 81177bda00..c3ac6f9ba0 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 >@@ -2,15 +2,19 @@ > [% USE Asset %] > [% USE Branches %] > [% USE Categories %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% IF op == 'add_form' %] >- New identity provider › [% ELSIF op == 'edit_form' %] >- Edit identity provider › [% END %] >- >- Identity providers › Administration › Koha >-</title> >+ [% t("New identity provider") | html %] › >+ [% ELSIF op == 'edit_form' %] >+ [% t("Edit identity provider") | html %] › >+ [% END %] >+ [% t("Identity providers") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 3030a3b2a7..9a3a0d8623 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt >@@ -1,9 +1,14 @@ > [% USE raw %] > [% USE Asset %] > [% USE Branches %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Item circulation alerts › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Item circulation alerts") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% FILTER collapse %] > <style> >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 1f9d8f19fd..564fa8a263 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt >@@ -1,9 +1,14 @@ > [% USE raw %] > [% USE Asset %] >-[% SET footerjs = 1 %] > [% USE AuthorisedValues %] >+[% PROCESS 'i18n.inc' %] >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >- <title>Item search fields › Administration › Koha</title> >+ <title>[% FILTER collapse %] >+ [% t("Item search fields") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 28b86492f7..9510753ab7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt >@@ -1,9 +1,14 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% USE AuthorisedValues %] > [% INCLUDE 'doc-head-open.inc' %] >- <title>Item search fields › Administration › Koha</title> >+ <title>[% FILTER collapse %] >+ [% t("Item search fields") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 fb8d6956e4..223874d425 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt >@@ -5,25 +5,31 @@ > [% USE AuthorisedValues %] > [% USE Price %] > [% USE TablesSettings %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >-[% IF op == 'add_form' %] >- [% IF ( itemtype ) %] >- Modify item type '[% itemtype.itemtype | html %]' >- [% ELSE %] >- Add item type >- [% END %] › [% END %] >-[% IF op == 'delete_confirm' %] >- [% IF ( total ) %] >- Cannot delete item type '[% itemtype.itemtype | html %]' >- [% ELSE %] >- Delete item type '[% itemtype.itemtype | html %]'? >- [% END %] › [% END %] >-[% IF op == 'delete_confirmed' %] >- Data deleted › [% END %] >-Item types › Administration › Koha >-</title> >+<title>[% FILTER collapse %] >+ [% IF op == 'add_form' %] >+ [% IF ( itemtype ) %] >+ [% tx("Modify item type '{item_type}'", { item_type = itemtype.itemtype }) | html %] >+ [% ELSE %] >+ [% t("Add item type") | html %] >+ [% END %] › >+ [% END %] >+ [% IF op == 'delete_confirm' %] >+ [% IF ( total ) %] >+ [% tx("Cannot delete item type '{item_type}'", { item_type = itemtype.itemtype }) | html %] >+ [% ELSE %] >+ [% tx("Delete item type '{item_type}'?", { item_type = itemtype.itemtype }) | html %] >+ [% END %] › >+ [% END %] >+ [% IF op == 'delete_confirmed' %] >+ [% t("Data deleted") | html %] › >+ [% END %] >+ [% t("Item types") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% FILTER collapse %] > <style> >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 6b8aea71be..e2c8931dca 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt >@@ -1,8 +1,13 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha to MARC mapping › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Koha to MARC mapping") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 6bb25af194..ac409c2c5c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt >@@ -1,9 +1,14 @@ > [% USE raw %] > [% USE Asset %] > [% USE KohaSpan %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Library groups › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Library groups") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("lib/jquery/plugins/treetable/stylesheets/jquery.treetable.css") | $raw %] > </head> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt >index dde2683174..743d000065 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt >@@ -1,8 +1,12 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Localization › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Localization") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' popup => 1 %] > <style>#localization { margin-top: 1em; }</style> > </head> >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 fd96291086..f5426f2289 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 >@@ -1,12 +1,17 @@ > [% USE raw %] > [% USE To %] > [% USE Asset %] >-[% SET footerjs = 1 %] > [% USE Koha %] > [% USE KohaSpan %] > [% PROCESS 'i18n.inc' %] >+[% PROCESS 'i18n.inc' %] >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>MARC overlay rules › Koha › Administration</title> >+<title>[% FILTER collapse %] >+ [% t("MARC overlay rules") | html %] › >+ [% t("Koha") | html %] › >+ [% t("Administration") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > > <style> >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 c9d6ec4e52..f84367a249 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt >@@ -1,36 +1,34 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >- [%- IF ( add_form ) -%] >- [%- IF ( use_heading_flags_p ) -%] >- [%- IF ( heading_edit_subfields_p ) -%] >- Edit MARC subfields constraints › MARC subfield structure >- [%- END -%] >- >- [%- ELSE -%] >- [%- action | html -%] › MARC subfield structure >- [%- END -%] >- >- [%- END -%] >- >- [%- IF ( delete_confirm ) -%] >- >- MARC subfield structure › Confirm deletion of subfield [%- mss.tagsubfield | html -%] >- >- Confirm deletion of subfield [%- tagsubfield | html -%] › MARC subfield structure >- [%- END -%] >- >- [%- IF ( delete_confirmed ) -%] >- Subfield deleted › MARC subfield structure >- >- [%- END -%] >- >- [%- IF ( else ) -%] >- MARC subfield structure >- [%- END -%] › Administration › Koha >-</title> >+<title>[% FILTER collapse %] >+ [% IF ( add_form ) %] >+ [% IF ( use_heading_flags_p ) %] >+ [% IF ( heading_edit_subfields_p ) %] >+ [% t("Edit MARC subfields constraints") | html %] › >+ [% t("MARC subfield structure") | html %] >+ [% END %] >+ [% ELSE %] >+ [% action | html %] › >+ [% t("MARC subfield structure") | html %] >+ [% END %] >+ [% END %] >+ [% IF ( delete_confirm ) %] >+ Confirm deletion of subfield [% tagsubfield | html %] › >+ [% t("MARC subfield structure") | html %] >+ [% END %] >+ [% IF ( delete_confirmed ) %] >+ [% t("Subfield deleted") | html %] › >+ [% t("MARC subfield structure") | html %] >+ [% END %] >+ [% IF ( else ) %] >+ [% t("MARC subfield structure") | html %] >+ [% END %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style>.constraints::after { content: " "; clear: both; display:block; }</style> > </head> >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 0027043715..c4427f0aa5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt >@@ -1,23 +1,27 @@ > [% USE raw %] > [% USE Asset %] > [% USE AuthorisedValues %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >-[% IF ( add_form ) %] >- [% IF heading_add_tag_p %] >- Add tag [% searchfield | html %] >- [% ELSE %] >- Modify tag [% searchfield | html %] >- [% END %] › [% END %] >- >-[% IF ( delete_confirm ) %] >- Confirm deletion of tag '[% searchfield | html %]' › [% END %] >- >-[% IF ( delete_confirmed ) %] >- Data deleted › [% END %] >-MARC frameworks › Administration › Koha >-</title> >+<title>[% FILTER collapse %] >+ [% IF ( add_form ) %] >+ [% IF heading_add_tag_p %] >+ [% tx("Add tag {searchfield}", { searchfield = searchfield }) | html %] >+ [% ELSE %] >+ [% tx("Modify tag {searchfield}", { searchfield = searchfield }) | html %] >+ [% END %] › >+ [% END %] >+ [% IF ( delete_confirm ) %] >+ [% tx("Confirm deletion of tag {searchfield}", { searchfield = searchfield }) | html %] › >+ [% END %] >+ [% IF ( delete_confirmed ) %] >+ [% t("Data deleted") | html %] › >+ [% END %] >+ [% t("MARC frameworks") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 4e7cd0eec1..920841d12c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt >@@ -1,19 +1,23 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% IF ( matching_rule_form ) %] > [% IF ( edit_matching_rule ) %] >- Modify record matching rule › [% ELSE %] >- Add record matching rule › [% END %] >+ [% t("Modify record matching rule") | html %] › >+ [% ELSE %] >+ [% t("Add record matching rule") | html %] › >+ [% END %] > [% END %] >- > [% IF ( delete_matching_rule_form ) %] >- Confirm deletion of record matching rule "[% code | html %]" › [% END %] >- >- Record matching rules › Administration › Koha >-</title> >+ [% tx("Confirm deletion of record matching rule '{code}'", { code = code }) | html %] › >+ [% END %] >+ [% t("Record matching rules") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > > [% BLOCK norms_text %] >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 1698ee648a..f550b5bdee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt >@@ -1,8 +1,14 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>OAI set mappings › OAI sets › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("OAI set mappings") | html %] › >+ [% t("OAI sets") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 2d3a7e1a29..e6d163f852 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt >@@ -1,12 +1,16 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% IF ( op_new ) %] >- Add a new OAI set › [% END %] >- OAI sets configuration › Administration › Koha >-</title> >+ [% t("Add a new OAI set") | html %] › >+ [% END %] >+ [% t("OAI sets configuration") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 73f7c7e214..8aec826fe6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt >@@ -2,9 +2,14 @@ > [% USE Asset %] > [% USE Branches %] > [% USE HtmlTags %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>OverDrive library authnames › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("OverDrive library authnames") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 607ba305cf..5fbec255a6 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 >@@ -4,20 +4,24 @@ > [% USE AuthorisedValues %] > [% USE Branches %] > [% USE scalar %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >-[% IF ( attribute_type_form ) %] >- [% IF ( edit_attribute_type ) %] >- Modify patron attribute type › [% ELSE %] >- Add patron attribute type › [% END %] >-[% END %] >- >-[% IF ( delete_attribute_type_form ) %] >- Confirm deletion of patron attribute type "[% code | html %]" › [% END %] >- >-Patron attribute types › Administration › Koha >-</title> >+<title>[% FILTER collapse %] >+ [% IF ( attribute_type_form ) %] >+ [% IF ( edit_attribute_type ) %] >+ [% t("Modify patron attribute type") | html %] › >+ [% ELSE %] >+ [% t("Add patron attribute type") | html %] › >+ [% END %] >+ [% END %] >+ [% IF ( delete_attribute_type_form ) %] >+ [% tx("Confirm deletion of patron attribute type '{code}'", { code = code }) | html %] › >+ [% END %] >+ [% t("Patron attribute types") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 e0a330ba21..f3cac515e1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -3,9 +3,14 @@ > [% USE Asset %] > [% USE Koha %] > [% USE HtmlId %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>System preferences › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("System preferences") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("css/preferences.css") | $raw %] > [% Asset.css("lib/jquery/plugins/multiple-select/multiple-select.css") | $raw %] >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 5b9dcc7ca4..090a6e3e42 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt >@@ -4,9 +4,21 @@ > [% PROCESS 'restriction-types.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>[% IF op == 'add_form' %][% IF ( restriction ) %]Modify restriction type '[% PROCESS restriction_type_description restriction_type=restriction %]' › [% ELSE %]New restriction type › [% END %][% END %] >-[% IF op == 'delete_confirm' %]Confirm deletion of restriction type '[% PROCESS restriction_type_description restriction_type=restriction %]' › [% END %]Patron restriction types › Administration › Koha >-</title> >+<title>[% FILTER collapse %] >+ [% IF op == 'add_form' %] >+ [% IF ( restriction ) %] >+ [% t("Modify restriction type") | html %] '[% PROCESS restriction_type_description restriction_type=restriction %]' › >+ [% ELSE %] >+ [% t("New restriction type") | html %] › >+ [% END %] >+ [% END %] >+ [% IF op == 'delete_confirm' %] >+ [% t("Confirm deletion of restriction type") | html %] '[% PROCESS restriction_type_description restriction_type=restriction %]' › >+ [% END %] >+ [% t("Patron restriction types") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 239ee38597..53412ca92f 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 >@@ -1,9 +1,14 @@ > [% USE raw %] > [% USE Asset %] >-[% SET footerjs = 1 %] > [% USE AuthorisedValues %] >+[% PROCESS 'i18n.inc' %] >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >- <title>Search filters › Administration › Koha</title> >+ <title>[% FILTER collapse %] >+ [% t("Search filters") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 adecb5af10..bb358605f6 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 >@@ -3,7 +3,11 @@ > [% SET footerjs = 1 %] > [% PROCESS 'i18n.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Search engine configuration (Elasticsearch) › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Search engine configuration (Elasticsearch)") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > a.add, a.delete { >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 cea35c77e2..e531e6791d 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 >@@ -1,9 +1,14 @@ > [% USE raw %] > [% USE Asset %] >-[% SET footerjs = 1 %] > [% USE Koha %] >+[% PROCESS 'i18n.inc' %] >+[% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Share content with Mana KB › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Share content with Mana KB") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 f91a10029d..a9607d3f5c 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 >@@ -7,6 +7,7 @@ > [% USE ItemTypes %] > [% USE CirculationRules %] > [% USE Price %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > > [% SET branchcode = humanbranch || undef %] >@@ -24,7 +25,11 @@ > [% itemtypes.push(undef) %] > > [% INCLUDE 'doc-head-open.inc' %] >-<title>Circulation and fine rules › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Circulation and fine rules") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 65c517751b..5ac85e292d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt >@@ -1,8 +1,13 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>SMS cellular providers › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("SMS cellular providers") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 206f53950a..25bc381254 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 >@@ -1,14 +1,18 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% IF op == 'add_form' %] >- New SMTP server › [% ELSIF op == 'edit_form' %] >- Edit SMTP server › [% END %] >- >- SMTP servers › Administration › Koha >-</title> >+ [% t("New SMTP server") | html %] › >+ [% ELSIF op == 'edit_form' %] >+ [% t("Edit SMTP server") | html %] › >+ [% END %] >+ [% t("SMTP servers") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 90e89c4b87..2c4cfb5336 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt >@@ -1,8 +1,12 @@ > [% USE raw %] > [% USE Asset %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>SRU search fields mapping for bibliographic records › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("SRU search fields mapping for bibliographic records") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 f778d64e6d..55e25f8887 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 >@@ -1,6 +1,10 @@ >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>SRU search fields mapping for authorities › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("SRU search fields mapping for authorities") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 52e8a8dc55..014c67cfbf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt >@@ -1,27 +1,30 @@ > [% USE raw %] > [% USE Asset %] > [% USE Koha %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title> >+<title>[% FILTER collapse %] > [% IF ( add_form ) %] > [% IF ( modify ) %] >- Modify system preference '[% searchfield | html %]' >+ [% tx("Modify system preference '{searchfield}'", { searchfield = searchfield }) | html %] > [% ELSE %] >- Add a system preference >- [% END %] › [% END %] >- >+ [% t("Add a system preference") | html %] >+ [% END %] › >+ [% END %] > [% IF ( add_validate ) %] >- Data added › [% END %] >- >+ [% t("Data added") | html %] › >+ [% END %] > [% IF ( delete_confirm ) %] >- Confirm deletion of parameter '[% searchfield | html %]' › [% searchfield | html %] › [% END %] >- >+ [% tx("Confirm deletion of parameter '{searchfield}'", { searchfield = searchfield }) | html %] › >+ [% END %] > [% IF ( delete_confirmed ) %] >- Parameter deleted › [% END %] >- >- System preferences › Administration › Koha >-</title> >+ [% t("Parameter deleted") | html %] › >+ [% END %] >+ [% t("System preferences") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 ce8307211a..cdd7450c4d 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 >@@ -5,9 +5,14 @@ > [% USE Koha %] > [% USE ItemTypes %] > [% USE AuthorisedValues %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Library checkin and transfer policy › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Library checkin and transfer policy") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style>td { text-align: center; } .sorted { min-width: 50%; }</style> > </head> >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 60b361e8ed..438d75f6a5 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 >@@ -2,8 +2,13 @@ > [% USE Asset %] > [% USE Branches %] > [% SET footerjs = 1 %] >+[% PROCESS 'i18n.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Transport cost matrix › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Transport cost matrix") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > .disabled-transfer { >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 18762120e5..a6630da114 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 >@@ -4,8 +4,13 @@ > [% USE Koha %] > [% USE KohaDates %] > [% USE Price %] >+[% PROCESS 'i18n.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha usage statistics › Administration › Koha</title> >+<title>[% FILTER collapse %] >+ [% t("Koha usage statistics") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% Asset.css("lib/leaflet/leaflet.css") | $raw %] > </head> >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 e3197dbfb4..f86e921af0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt >@@ -1,25 +1,27 @@ > [% USE raw %] > [% USE Asset %] >+[% USE HtmlTags %] >+[% PROCESS 'i18n.inc' %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] > >-[% BLOCK ServerType %] >- [% IF (server.servertype||type) == 'sru' %] >- <span>SRU</span> >- [% ELSIF (server.servertype||type) == 'zed' %] >- <span>Z39.50</span> >- [% END %] >+[% IF (server.servertype||type) == 'sru' %] >+ [% SET servertype = "SRU" %] >+[% ELSIF (server.servertype||type) == 'zed' %] >+ [% SET servertype = "Z39.50" %] > [% END %] > >-<title> >+<title>[% FILTER collapse %] > [% IF op == 'edit' %] >- Modify [% PROCESS ServerType | remove("</*span>") %] server [% server.servername | html %] › [% END %] >- >+ [% tx("Modify {servertype} server {servername}", { servertype = servertype, servername = servername }) | html %] › >+ [% END %] > [% IF op == 'add' %] >- New [% PROCESS ServerType | remove("</*span>") %] server › [% END %] >- >- Z39.50/SRU servers › Administration › Koha >-</title> >+ [% tx("New {servertype} server", { servertype = servertype }) | html %] › >+ [% END %] >+ [% t("Z39.50/SRU servers") | html %] › >+ [% t("Administration") | html %] › >+ [% t("Koha") | html %] >+[% END %]</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >@@ -42,12 +44,12 @@ > > [% IF op == 'edit' %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>Modify [% PROCESS ServerType %] server [% server.servername | html %]</span> >+ <span>Modify [% servertype | html %] server [% server.servername | html %]</span> > [% END %] > > [% ELSIF op == 'add' %] > [% WRAPPER breadcrumb_item bc_active= 1 %] >- <span>New [% PROCESS ServerType %] server</span> >+ <span>New [% servertype | html %] server</span> > [% END %] > > [% ELSE %] >@@ -78,10 +80,10 @@ > <input type="hidden" name="op" value="add_validated" /> > <input type="hidden" name="servertype" value="[% server.servertype||type||'zed' | html %]"/> > [% IF op == 'edit' %] >- <h1>Modify [% PROCESS ServerType %] server</h1> >+ <h1>Modify [% servertype | html %] server</h1> > <input type="hidden" name="id" value="[% server.id | html %]" /> > [% ELSE %] >- <h1>New [% PROCESS ServerType %] server</h1> >+ <h1>New [% servertype | html %] server</h1> > [% END %] > <fieldset class="rows"> > <ol> >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33909
:
152123
|
153057
|
153901
|
154003
|
154004
|
154116
|
154117