@@ -, +, @@ they have special heading tags instead) - some of these will be --- .../intranet-tmpl/prog/en/modules/admin/additional-fields.tt | 1 + .../intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt | 1 + .../intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt | 4 ++++ koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt | 3 ++- 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 | 2 ++ .../intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt | 2 ++ .../intranet-tmpl/prog/en/modules/admin/authorised_values.tt | 2 ++ 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 | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt | 4 ++++ koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt | 2 ++ koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt | 3 ++- .../intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt | 2 +- .../prog/en/modules/admin/item_circulation_alerts.tt | 4 ++-- .../prog/en/modules/admin/items_search_fields.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 2 ++ .../intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt | 1 + .../intranet-tmpl/prog/en/modules/admin/library_groups.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.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 | 5 ++++- .../en/modules/admin/searchengine/elasticsearch/mappings.tt | 4 +++- koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 11 +++++++++++ .../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/systempreferences.tt | 2 ++ .../prog/en/modules/admin/transport-cost-matrix.tt | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 1 + 47 files changed, 83 insertions(+), 11 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt @@ -122,6 +122,7 @@

Additional fields for '[% tablename | html %]'

[% IF fields %] + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt @@ -45,6 +45,7 @@
Fields
Name
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -367,6 +367,7 @@

The unreceived orders from the following funds will be moved

Fund list of budget [% budget_period_description | html %]:
Shortcuts
Description Shortcut keys
+ @@ -417,6 +418,7 @@

Report after moving unreceived orders from budget [% from_budget_period.budget_period_description | html %] ([% from_budget_period.budget_period_startdate | $KohaDates %] - [% from_budget_period.budget_period_enddate | $KohaDates %]) to [% to_budget_period.budget_period_description | html %] ([% to_budget_period.budget_period_startdate | $KohaDates %] - [% to_budget_period.budget_period_enddate | $KohaDates%])

Budgets
Fund ID
+ @@ -481,6 +483,7 @@
[% IF ( period_active_loop ) %]
Closed report
Budget id
+ @@ -517,6 +520,7 @@
[% IF ( period_inactive_loop ) %]
Active periods
Budget name
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -115,6 +115,7 @@ [% END %]
Inactive periods
Budget name
+ @@ -415,6 +416,7 @@

Delete fund [% budget_name | html %]?

If you delete this fund, all orders linked to this fund will be deleted!
Funds
Active
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -156,8 +156,8 @@ [% END %] [% IF ( delete_confirm ) %]
-

Confirm deletion of contract [% contractname | html %]

Fund to delete
Fund amount: [% budget_amount | $Price %]
+ @@ -189,6 +189,7 @@

Contract(s) of [% booksellername | html %]

[% IF ( loop ) %]

Confirm deletion of contract [% contractname | html %]

Contract number:[% contractnumber | html %]
Contract name:[% contractname | html %]
Contract description:[% contractdescription | html %]
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -61,6 +61,7 @@ [% END %]

Contracts
Name Description
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt @@ -98,6 +98,7 @@ [% END %]
Plan
Fund name
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt @@ -274,6 +274,7 @@
Audio alerts
 
+
Subfield to delete
Subfield: [% ass.tagsubfield | html %]
Description: [% ass.liblibrarian | html_entity %]
@@ -298,6 +299,7 @@

The column 'Koha field' shows that the subfield is linked with a Koha field.

+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt @@ -231,6 +231,7 @@ Authority MARC framework › Administration › Koha

Confirm deletion

Subfields
Subfield
+
Tag to delete
Tag: [% searchfield | html %] [% liblibrarian | html %]
@@ -296,6 +297,7 @@ Authority MARC framework › Administration › Koha
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -253,6 +253,7 @@ Authorized values › Administration › Koha [% IF loop %]
Tags
Tag
+ @@ -314,6 +315,7 @@ Authorized values › Administration › Koha [% ELSE # category was selected %]
Authorized values
Authorized value Description
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -169,6 +169,7 @@ Authority types › Administration › Koha

Authority types

Define authority types, then authority MARC structure in the same way you define itemtypes and bibliographic MARC tag structure. Authority values are managed through plugins

Categories
Category
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt @@ -166,6 +166,7 @@ Administration › Koha [% IF jobs.count %]
Authority types
Code
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -161,6 +161,7 @@ MARC frameworks › Administration › Koha

MARC frameworks

Background jobs
Job ID
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt @@ -66,6 +66,7 @@

Select all | Clear all

Frameworks
Code
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -293,6 +293,7 @@ Libraries › Administration › Koha

Libraries

[% IF libraries_count > 0 %]
Libraries to transfer
Library
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt @@ -164,6 +164,7 @@ Cash registers › Administration › Koha [% IF cash_registers.count %]
Libraries
Name
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -439,6 +439,7 @@ [% END %]
Cash registers
Name Description
+ @@ -512,6 +513,7 @@ [% END %] [% IF categories%]
Category to delete
Category code: [% category.categorycode | html %]
Description: [% category.description | html %]
Enrollment period:
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/checkmarc.tt @@ -38,6 +38,7 @@

MARC bibliographic framework test

Categories
Code
+ @@ -180,6 +181,7 @@
Test
Test Resultsubfields not in same tabs Not all subfields for the following tags are in the same tab (or marked 'ignored'). + @@ -213,6 +215,7 @@
Inconsistent tabs
Code Descriptioninvalid authority types Not all authority types referred to by the frameworks are defined. + @@ -248,6 +251,7 @@
Invalid authority type codes
Framework code Framework descriptionitems.permanent_location mapped The following mappings exist for items.permanent_location, and they shouldn't. + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -139,6 +139,7 @@

Delete city "[% city.city_name | html %]?"

Permanent location mapped
Framework code Framework description
+ @@ -180,6 +181,7 @@ [% IF cities_count > 0 %]
City to delete
City id [% city.cityid | html %]
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -341,8 +341,8 @@ Classification sources › Administration › Koha New splitting rule

Classification sources

-

Classification sources

Cities
City ID
+ @@ -366,8 +366,8 @@ Classification sources › Administration › Koha [% END %]
Classification sources
Code Description
-

Classification filing rules

+ @@ -387,8 +387,8 @@ Classification sources › Administration › Koha [% END %]
Classification filing rules
Code Description
-

Classification splitting rules

+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt @@ -160,6 +160,7 @@

Account credit types

[% IF credit_types.count %]
Classification splitting rules
Code Description
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -179,6 +179,7 @@

Confirm deletion of currency [% currency.currency | $HtmlTags tag='span' attributes=>'class="ex"' %]

Account credit types
Archived System
+ @@ -211,6 +212,7 @@ [% END %]
Currency to delete
Currency [% currency.currency | html %]
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt @@ -151,6 +151,7 @@

Account debit types

[% IF debit_types.count %]
Currencies
Currency
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt @@ -141,6 +141,7 @@

Delete desk "[% desk.desk_name | html %]?"

Account debit types
Archived System
+ @@ -175,6 +176,7 @@ [% IF desks.count %]
Desk to delete
Desk ID [% desk.desk_id | html %]
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -244,6 +244,7 @@ EDI accounts › Administration › Koha

Delete this account?

Desks
Desk ID
+ @@ -271,9 +272,9 @@ EDI accounts › Administration › Koha [% END %] [% IF display %] [% IF ( ediaccounts ) %] -

Vendor EDI accounts

Account to delete
Vendor [% account.vendor.name | html %]
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt @@ -159,8 +159,8 @@ Library EANs › Administration › Koha [% IF display %] [% IF ( eans ) %] -

Library EANs

Vendor EDI accounts

ID Vendor
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/item_circulation_alerts.tt @@ -115,8 +115,8 @@ table.grid td.default {
-

Checkout

Library EANs

Library Description
+ @@ -139,8 +139,8 @@ table.grid td.default {
-

Check-in

Checkout
 
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_fields.tt @@ -66,9 +66,9 @@ [% END %] [% IF fields.size %]
-

Item search fields

Check-in
 
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -409,6 +409,7 @@ Item types › Administration › Koha

Delete item type '[% itemtype.itemtype | html %]'?

Item search fields

Name
+ @@ -439,6 +440,7 @@ Item types › Administration › Koha

Item types administration

[% IF itemtypes %]
Item type to delete
Item type [% itemtype.itemtype | html %]
+ [% UNLESS Koha.Preference('noItemTypeImages') && Koha.Preference('OpacNoItemTypeImages') %][% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt @@ -39,6 +39,7 @@ [% END %]
Item types
ImageDescription
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt @@ -76,6 +76,7 @@ [% FOREACH root_group IN root_groups %]
Koha fields
Koha field Tag
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt @@ -59,6 +59,7 @@
Library groups
  Description
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt @@ -361,6 +361,7 @@

The column 'Koha field' shows that the subfield is linked with a Koha field.

Localization
Id
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -254,6 +254,7 @@ MARC frameworks › Administration › Koha
MARC subfeld structure
Subfield
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -456,6 +456,7 @@ [% END %] [% IF ( available_matching_rules ) %]
MARC tag structure
Tag
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_set_mappings.tt @@ -44,6 +44,7 @@ [% END %]
Record matching rules
# Code
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt @@ -104,6 +104,7 @@

OAI sets

[% IF sets_loop %]
Mappings
Rule operator
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt @@ -38,6 +38,7 @@
OAI sets
setSpec
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tt @@ -293,6 +293,7 @@ Patron attribute types › Administration › Koha

[% attribute.lib | html %]

[% END %]
OverDrive library authnames info
Library
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -74,10 +74,13 @@
Patron attribute types
Code
+ [% UNLESS ( loop.last ) %][% END %] [% ELSE %] - [% IF ( loop.first ) %]
Preferences
PreferenceValue
[% END %] + [% IF ( loop.first ) %]
PreferenceValue
+ + [% END %]
Preferences
PreferenceValue
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt @@ -127,6 +127,7 @@ a.add, a.delete {
+ @@ -249,6 +250,7 @@ a.add, a.delete { [% FOREACH index IN indexes %]
Search fields
Name
+ @@ -415,9 +417,9 @@ a.add, a.delete {
Mappings
Search field
[% IF index.index_name == 'biblios' %] -

Facet order

+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -102,6 +102,7 @@

Facet order

Search field
+ @@ -533,6 +534,7 @@
Default circulation rules
 
+ @@ -719,6 +721,7 @@
Default checkout, hold and return policy[% IF humanbranch %] for [% Branches.GetName( humanbranch ) | html %][% END %]
  Total current checkouts allowed
+ @@ -799,6 +802,13 @@
[% IF humanbranch %]Checkout, hold policy by patron category for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default checkout, hold policy by patron category[% END %]
Patron category Total current checkouts allowed
+ @@ -915,6 +925,7 @@
+ [% IF current_branch == '*' %] + Default lost item fee refund on return policy + [% ELSE %] + Lost item fee refund on return policy for [% Branches.GetName(current_branch) | html %] + [% END %] +
Refund lost item fee  
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt @@ -40,6 +40,7 @@ [% IF providers.size %]
[% IF humanbranch %]Holds policy by item type for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default holds policy by item type[% END %]
Item type Hold policy
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt @@ -247,6 +247,7 @@ [% IF servers_count > 0 %]
Providers
Name
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -328,9 +328,11 @@ [% IF ( tab != 'local_use' ) %]

Please click on one of the tabs at the left side of this form.

SMTP servers
Name
+ [% ELSE %]

Local use preferences

Preferences
+ --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/transport-cost-matrix.tt @@ -63,6 +63,7 @@
Preferences
Preference Explanation
+ [% FOR b IN Branches.all() %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -200,6 +200,7 @@ You searched for [% searchfield | html %] [% END %]
Transport costs between libraries
From \ To
+ --
Servers
TargetHostname/PortDatabaseUseridPasswordPreselectedRankSyntaxEncodingTimeoutRecord typeAttributesActions