@@ -, +, @@ --- .../prog/en/modules/admin/additional-fields.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/admin/admin-home.tt | 2 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 16 +++++++++------- .../intranet-tmpl/prog/en/modules/admin/aqcontract.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/audio_alerts.tt | 2 +- .../prog/en/modules/admin/background_jobs.tt | 2 +- .../prog/en/modules/admin/biblio_framework.tt | 12 ++++++------ .../intranet-tmpl/prog/en/modules/admin/branches.tt | 6 +++--- .../prog/en/modules/admin/cash_registers.tt | 3 ++- .../intranet-tmpl/prog/en/modules/admin/categories.tt | 14 ++++++++------ koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/classsources.tt | 14 +++++++------- .../intranet-tmpl/prog/en/modules/admin/clone-rules.tt | 4 ++-- .../prog/en/modules/admin/columns_settings.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/credit_types.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/admin/currency.tt | 16 +++++++++------- .../intranet-tmpl/prog/en/modules/admin/debit_types.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/didyoumean.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/edi_accounts.tt | 16 +++++++++------- .../prog/en/modules/admin/edi_ean_accounts.tt | 16 +++++++++------- .../prog/en/modules/admin/items_search_fields.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 8 ++++---- .../prog/en/modules/admin/library_groups.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/localization.tt | 1 + .../prog/en/modules/admin/marc_subfields_structure.tt | 2 +- .../prog/en/modules/admin/matching-rules.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/admin/oai_sets.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/admin/overdrive.tt | 2 +- .../prog/en/modules/admin/patron-attr-types.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/admin/preferences.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/sms_providers.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/smtp_servers.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 2 +- 35 files changed, 116 insertions(+), 104 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 @@ -63,7 +63,7 @@ [% IF op == 'list_tables' %] [% IF CAN_user_acquisitions_order_manage || CAN_user_serials_edit_subscription %] -

Additional fields

+

Additional fields

Select a table:

[% BLOCK table_option %]
  • [% content | html %] ([% value | html %])
  • @@ -80,7 +80,7 @@ Additional permissions in the acquisitions or serials modules are required for editing additional fields [% END %] [% ELSIF op == 'list' %] -

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

    +

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

    [% IF fields %] @@ -118,9 +118,9 @@ [% END %] [% ELSIF op == 'add_form' %] [% IF field %] -

    Modify field

    +

    Modify field

    [% ELSE %] -

    Add field

    +

    Add field

    [% END %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -13,6 +13,7 @@
    +

    Koha administration

    [% IF ( CAN_user_parameters_manage_mana ) %] [% IF ( Koha.Preference('Mana') == 1) && !mana_url %]
    @@ -39,7 +40,6 @@
    [% END %] [% END %] -

    Koha administration

    [% IF ( CAN_user_parameters_manage_sysprefs ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -123,7 +123,7 @@ [% END %] [% IF ( duplicate_form ) %] -

    Duplicate budget

    +

    Duplicate budget

    @@ -189,9 +189,9 @@ [% IF ( budget_period_id ) %] -

    Modify budget [% budget_period_description | html %]

    +

    Modify budget [% budget_period_description | html %]

    [% ELSE %] -

    Add budget

    +

    Add budget

    [% END %]
    @@ -270,16 +270,16 @@ [% IF ( delete_confirm ) %] [% IF ( total ) %]
    -

    Cannot delete budget

    +

    Cannot delete budget

    This record is used [% total | html %] times . Deletion is not possible.

    [% ELSIF ( funds_exist ) %]
    -

    Cannot delete budget

    +

    Cannot delete budget

    This budget has funds attached. You must delete all attached funds before you can delete this budget.

    [% ELSE %]
    -

    Delete budget '[% budget_period_description | html %]'?

    +

    Delete budget '[% budget_period_description | html %]'?

    @@ -299,6 +299,7 @@ [% END %] [% IF close_form %] +

    Close budget [% budget_period_description | html %]

    [% IF budget_periods.size == 0 %] You cannot move funds of this budget, there is no active budget. Please create a new active budget and retry. @@ -356,6 +357,7 @@ [% END %] [% ELSIF closed %] +

    Budget [% budget_period_description | html %] closed

    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%])

    @@ -406,7 +408,7 @@ [% IF ( else ) %] -

    Budgets administration

    +

    Budgets administration

    [% IF ( failed_delete_funds_exist ) %]
    Failed to delete budget because funds exist.
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -101,14 +101,14 @@ [% END %] [% IF ( add_validate ) %] -

    Data recorded

    +

    Data recorded

    [% END %] [% IF ( delete_confirm ) %]
    -

    Confirm deletion of contract [% contractname | html %]

    +

    Confirm deletion of contract [% contractname | html %]

    @@ -131,14 +131,14 @@ [% END %] [% IF ( delete_confirmed ) %] -

    Contract deleted

    +

    Contract deleted

    [% END %] [% IF ( else ) %] -

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

    +

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

    [% IF ( loop ) %]
    Contract number:[% contractnumber | html %]
    Contract name:[% contractname | html %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -29,7 +29,7 @@ [% INCLUDE 'budgets-admin-toolbar.inc' %] -

    Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %]

    +

    Planning for [% budget_period_description | html %] [% PROCESS planning plan=authcat %]

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt @@ -72,7 +72,7 @@ -

    Audio alerts

    +

    Audio alerts

    [%IF !( Koha.Preference('AudioAlerts') ) %]

    Audio alerts are disabled

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/background_jobs.tt @@ -139,7 +139,7 @@ [% IF op == 'list' %] -

    Background jobs

    +

    Background jobs

    [% IF jobs.count %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -98,14 +98,14 @@ [% IF op == 'delete_confirm' %]
    [% IF biblios_use_this_framework %] -

    This framework cannot be deleted

    +

    This framework cannot be deleted

    [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])

    The framework is used [% biblios_use_this_framework | html %] times.

    [% ELSE %] -

    Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])?

    +

    Delete framework for [% framework.frameworktext | html %] ([% framework.frameworkcode | html %])?

    @@ -152,7 +152,7 @@
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt @@ -60,7 +60,7 @@ [% END %] [% IF op == 'add_form' %] -

    [% IF cash_register %]Modify cash register[% ELSE %]Add new cash register[% END %]

    +

    [% IF cash_register %]Modify cash register[% ELSE %]Add new cash register[% END %]

    @@ -117,6 +117,7 @@ New cash register +

    Cash registers

    Cash registers for

    @@ -128,7 +128,7 @@ New city -

    Cities

    +

    Cities

    [% IF city_name_filter %] Searching: [% city_name_filter | html %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -96,9 +96,9 @@ [% IF op == 'add_source' %] [% IF class_source %] -

    Modify classification source

    +

    Modify classification source

    [% ELSE %] -

    Add classification source

    +

    Add classification source

    [% END %] @@ -160,9 +160,9 @@ [% IF op == 'add_sort_rule' %] [% IF sort_rule %] -

    Modify filing rule

    +

    Modify filing rule

    [% ELSE %] -

    Add filing rule

    +

    Add filing rule

    [% END %] @@ -206,9 +206,9 @@ [% IF op == 'add_split_rule' %] [% IF split_rule %] -

    Modify splitting rule

    +

    Modify splitting rule

    [% ELSE %] -

    Add splitting rule

    +

    Add splitting rule

    [% END %] @@ -285,7 +285,7 @@ New filing rule New splitting rule - +

    Classification sources

    Classification sources

    City id [% city.cityid | html %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt @@ -17,10 +17,10 @@
    -

    Cloning circulation and fine rules +

    Cloning circulation and fine rules [% IF frombranch %] from "[% Branches.GetName( frombranch ) | html %]"[% END %] [% IF tobranch %] to "[% Branches.GetName( tobranch ) | html %]"[% END %] -

    + [% IF ( result ) %] [% IF ( error ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt @@ -186,7 +186,7 @@
    -

    Table settings

    +

    Table settings

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt @@ -55,9 +55,9 @@ [% IF op == 'add_form' %] [% IF credit_type %] -

    Modify a credit type

    +

    Modify a credit type

    [% ELSE %] -

    New credit type

    +

    New credit type

    [% END %] @@ -133,7 +133,7 @@ New credit type
    -

    Account credit types

    +

    Account credit types

    [% IF credit_types.count %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -62,11 +62,13 @@
    - [% IF currency %] - Modify currency - [% ELSE %] - New currency - [% END %] +

    + [% IF currency %] + Modify currency + [% ELSE %] + New currency + [% END %] +

    1. @@ -140,7 +142,7 @@ [% ELSE %]
      -

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

      +

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

    @@ -163,7 +165,7 @@ [% IF op == 'list' %] -

    Currencies and exchange rates

    +

    Currencies and exchange rates

    [% IF currencies and no_active_currency %]

    No active currency is defined

    Please edit one currency and mark it as active.

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt @@ -56,9 +56,9 @@ [% IF op == 'add_form' %] [% IF debit_type %] -

    Modify a debit type

    +

    Modify a debit type

    [% ELSE %] -

    New debit type

    +

    New debit type

    [% END %] @@ -127,7 +127,7 @@ New debit type -

    Account debit types

    +

    Account debit types

    [% IF debit_types.count %]
    Currency [% currency.currency | html %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt @@ -96,7 +96,7 @@ [% IF op == 'delete_confirm' %]
    -

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

    +

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

    @@ -125,7 +125,7 @@ New desk -

    Desks

    +

    Desks

    [% IF searchfield %] Searching: [% searchfield | html %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/didyoumean.tt @@ -38,7 +38,7 @@
    -

    Did you mean?

    +

    Did you mean?

    Desk ID [% desk.desk_id | html %]
    @@ -239,7 +241,7 @@ [% END %] [% IF display %] [% IF ( ediaccounts ) %] -

    Vendor EDI accounts

    +

    Vendor EDI accounts

    Vendor
    --- 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 @@ -60,11 +60,13 @@
    - [% IF ean %] - Modify EAN - [% ELSE %] - New EAN - [% END %] +

    + [% IF ean %] + Modify EAN + [% ELSE %] + New EAN + [% END %] +

      @@ -117,7 +119,7 @@ [% IF delete_confirm %]
      -

      Delete EAN [% ean.ean | html %] for [% ean.branch.branchname | html %]?

      +

      Delete EAN [% ean.ean | html %] for [% ean.branch.branchname | html %]?

      @@ -131,7 +133,7 @@ [% IF display %] [% IF ( eans ) %] -

      Library EANs

      +

      Library EANs

    --- 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 @@ -55,7 +55,7 @@ [% END %] [% IF fields.size %]
    -

    Item search fields

    +

    Item search fields

    Library
    @@ -93,7 +93,7 @@
    - Add a new field +

    Add a new field

    [% INCLUDE 'admin-items-search-field-form.inc' field=undef %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -95,9 +95,9 @@ Item types administration [% IF op == 'add_form' %] [% IF itemtype %] -

    Modify item type

    +

    Modify item type

    [% ELSE %] -

    Add item type

    +

    Add item type

    [% END %] @@ -357,7 +357,7 @@ Item types administration [% IF op == 'delete_confirm' %]
    -

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

    +

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

    @@ -386,7 +386,7 @@ Item types administration [% END %] [% IF op == 'list' %] -

    Item types administration

    +

    Item types administration

    [% IF itemtypes %]
    Item type
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt @@ -64,7 +64,7 @@ -

    Library groups

    +

    Library groups

    [% FOREACH root_group IN root_groups %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt @@ -11,6 +11,7 @@
    +

    Localization

    --- 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 @@ -280,7 +280,7 @@ [% IF ( delete_confirm ) %]
    -

    Confirm deletion of subfield [% mss.tagsubfield | html %]?

    +

    Confirm deletion of subfield [% mss.tagsubfield | html %]?

    Subfield: [% mss.tagsubfield | html %]

    Description: [% mss.liblibrarian | html_entity %]

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/matching-rules.tt @@ -90,9 +90,9 @@ [% IF ( matching_rule_form ) %] [% IF ( edit_matching_rule ) %] -

    Modify record matching rule

    +

    Modify record matching rule

    [% ELSE %] -

    Add record matching rule

    +

    Add record matching rule

    [% END %] @@ -403,7 +403,7 @@ [% IF ( delete_matching_rule_form ) %]
    -

    Confirm deletion of record matching rule '[% code | html %]' ([% description | html %])?

    +

    Confirm deletion of record matching rule '[% code | html %]' ([% description | html %])?

    @@ -421,7 +421,7 @@ New record matching rule
    -

    Record matching rules

    +

    Record matching rules

    [% IF ( added_matching_rule ) %]
    Added record matching rule "[% added_matching_rule | html %]"
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt @@ -20,10 +20,10 @@ [% IF ( op_new || op_mod ) %] [% IF ( op_new ) %] -

    Add a new OAI set

    +

    Add a new OAI set

    [% ELSIF ( op_mod ) %] -

    Edit OAI set '[% spec | html %]'

    +

    Edit OAI set '[% spec | html %]'

    [% END %] @@ -60,7 +60,7 @@ New set
    -

    OAI sets

    +

    OAI sets

    [% IF sets_loop %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt @@ -21,7 +21,7 @@
    -

    OverDrive library authnames

    +

    OverDrive library authnames

    --- 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 @@ -49,9 +49,9 @@ [% IF ( attribute_type_form ) %] [% IF ( edit_attribute_type ) %] -

    Modify patron attribute type

    +

    Modify patron attribute type

    [% ELSE %] -

    Add patron attribute type

    +

    Add patron attribute type

    [% END %] [% IF ( duplicate_code_error ) %]
    Could not add patron attribute type "[% duplicate_code_error | html %]" @@ -221,7 +221,7 @@ [% IF ( delete_attribute_type_form ) %]
    -

    Confirm deletion of patron attribute type '[% code | html %]' ([% description | html %])?

    +

    Confirm deletion of patron attribute type '[% code | html %]' ([% description | html %])?

    @@ -239,7 +239,7 @@ New patron attribute type
    -

    Patron attribute types

    +

    Patron attribute types

    [% IF ( added_attribute_type ) %]
    Added patron attribute type "[% added_attribute_type | html %]"
    [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -24,8 +24,8 @@
    +

    System preferences

    [% IF ( jump_not_found ) %] -

    System preferences

    Could not find a system preference named [% jumpfield | html %].
    @@ -35,7 +35,7 @@ No system preferences matched your search for: [% searchfield | html %]
    [% ELSIF searchfield %] -

    You searched for: [% searchfield | html %]

    +

    You searched for: [% searchfield | html %]

    [% END %] [% FOREACH TAB IN TABS %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt @@ -21,7 +21,7 @@ New SMS provider
    -

    SMS cellular providers

    +

    SMS cellular providers

    [% IF providers.size %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt @@ -55,7 +55,7 @@ SMTP servers [% IF op == 'add_form' %] -

    New SMTP server

    +

    New SMTP server

    @@ -118,7 +118,7 @@ SMTP servers [% END %] [% IF op == 'edit_form' %] -

    Edit SMTP server

    +

    Edit SMTP server

    @@ -205,7 +205,7 @@ SMTP servers New SMTP server
    -

    SMTP servers

    +

    SMTP servers

    Default configuration:

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -154,7 +154,7 @@ New Z39.50 server New SRU server
    -

    Z39.50/SRU servers administration

    +

    Z19.50/SRU servers administration

    [% IF id %] You searched for record [% id | html %] [% ELSIF searchfield %] --