@@ -, +, @@ Administration --- .../prog/en/modules/admin/additional-fields.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/admin-home.tt | 2 +- .../prog/en/modules/admin/adveditorshortcuts.tt | 2 +- .../prog/en/modules/admin/aqbudgetperiods.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/aqcontract.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/admin/audio_alerts.tt | 2 +- .../prog/en/modules/admin/auth_subfields_structure.tt | 4 ++-- .../prog/en/modules/admin/auth_tag_structure.tt | 8 ++++---- .../prog/en/modules/admin/authorised_values.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/authtypes.tt | 2 +- .../prog/en/modules/admin/biblio_framework.tt | 2 +- .../prog/en/modules/admin/branch_transfer_limits.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/cash_registers.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/categories.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/classsources.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/admin/clone-rules.tt | 2 +- .../prog/en/modules/admin/columns_settings.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/credit_types.tt | 2 +- .../prog/en/modules/admin/curbside_pickup.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/debit_types.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/edi_accounts.tt | 2 +- .../prog/en/modules/admin/edi_ean_accounts.tt | 2 +- .../prog/en/modules/admin/item_circulation_alerts.tt | 2 +- .../prog/en/modules/admin/items_search_field.tt | 2 +- .../prog/en/modules/admin/items_search_fields.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/localization.tt | 2 +- .../prog/en/modules/admin/marc_subfields_structure.tt | 4 ++-- .../prog/en/modules/admin/marctagstructure.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/admin/matching-rules.tt | 4 ++-- .../prog/en/modules/admin/oai_set_mappings.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/overdrive.tt | 2 +- .../prog/en/modules/admin/patron-attr-types.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/preferences.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/restrictions.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/share_content.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/sms_providers.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/smtp_servers.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt | 2 +- .../prog/en/modules/admin/sru_modmapping_auth.tt | 2 +- .../prog/en/modules/admin/systempreferences.tt | 6 +++--- .../prog/en/modules/admin/transport-cost-matrix.tt | 2 +- .../prog/en/modules/admin/usage_statistics.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 2 +- 52 files changed, 79 insertions(+), 79 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 @@ -222,7 +222,7 @@ [% END %] - + Cancel --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -63,7 +63,7 @@

Manage global system preferences like MARC flavor, date format, administrator email, and templates.

- + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt @@ -64,7 +64,7 @@ [% END %] - + [% ELSE %]

Enable the advanced cataloging editor ( EnableAdvancedCatalogingEditor system preference) to define keyboard shortcuts

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -232,7 +232,7 @@
- + Cancel
@@ -306,7 +306,7 @@
- + [% IF ( budget_period_id ) %] Cancel [% ELSE %] @@ -406,7 +406,7 @@
- + Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -407,7 +407,7 @@
- Cancel + Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -147,14 +147,14 @@
- Cancel + Cancel
[% END %] [% IF ( add_validate ) %]

Data recorded

- +
[% END %] [% IF ( delete_confirm ) %] @@ -185,7 +185,7 @@

Contract deleted

- +
[% END %] [% IF ( else ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -170,7 +170,7 @@ [% ELSE %] -
+
[% END %] @@ -255,7 +255,7 @@
- +
@@ -279,7 +279,7 @@ -
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt @@ -83,7 +83,7 @@
- + Cancel
--- 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 @@ -89,7 +89,7 @@ -
Cancel
+
Cancel
[% BLOCK outputsubfield %][% FILTER collapse %] [% SWITCH ( subfieldanchor ) %] @@ -371,7 +371,7 @@
- + Cancel
--- 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 @@ -222,7 +222,7 @@ Authority MARC framework › Administration › Koha
- + Cancel
@@ -253,7 +253,7 @@ Authority MARC framework › Administration › Koha
- +
[% END %] [% IF ( authtype_create ) %] @@ -271,7 +271,7 @@ Authority MARC framework › Administration › Koha [% END %] [% END %] - + [% END %] @@ -294,7 +294,7 @@ Authority MARC framework › Administration › Koha [% END %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -256,7 +256,7 @@
- + Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -138,7 +138,7 @@ Authority types › Administration › Koha
- + Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt @@ -132,7 +132,7 @@ MARC frameworks › Administration › Koha
- +
[% END %] --- 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 @@ -102,7 +102,7 @@
- + Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -305,7 +305,7 @@ Libraries › Administration › Koha
- + Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cash_registers.tt @@ -144,9 +144,9 @@ Cash registers › Administration › Koha
[% IF cash_register %] - + [% ELSE %] - + [% END %] Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -450,7 +450,7 @@ [% END %]
- + Cancel
@@ -526,11 +526,11 @@
[% IF patrons_in_category > 0 %] - + [% ELSE %] - + Cancel [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt @@ -132,7 +132,7 @@
- + Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt @@ -210,7 +210,7 @@ Classification sources › Administration › Koha
- + Cancel
@@ -256,7 +256,7 @@ Classification sources › Administration › Koha
- + Cancel
@@ -330,7 +330,7 @@ Classification sources › Administration › Koha
- + Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt @@ -76,7 +76,7 @@ [% IF ( frombranch ) %][% END %] [% END %] - + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/columns_settings.tt @@ -140,7 +140,7 @@ [% END %]
- +
[% ELSE %] There is no table to configure for this module. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/credit_types.tt @@ -149,7 +149,7 @@
- + Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt @@ -170,7 +170,7 @@
- +
[% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt @@ -155,7 +155,7 @@
- + Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/debit_types.tt @@ -140,7 +140,7 @@
- + Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt @@ -139,7 +139,7 @@
- + Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -266,7 +266,7 @@ EDI accounts › Administration › Koha
- + Cancel
--- 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 @@ -140,7 +140,7 @@ Library EANs › Administration › Koha
- + Cancel
--- 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 @@ -80,7 +80,7 @@ [% PROCESS options_for_libraries libraries => Branches.all( selected => branch, unfiltered => 1 ) %] - +
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/items_search_field.tt @@ -58,7 +58,7 @@
- + Cancel
--- 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 @@ -113,7 +113,7 @@
- + Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -432,7 +432,7 @@ Item types › Administration › Koha
- + Cancel
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt @@ -42,7 +42,7 @@
  •   - +
  • --- 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 @@ -345,7 +345,7 @@
    - Cancel + Cancel
    [% END # /IF ( add_form ) %] @@ -436,7 +436,7 @@
    - + Cancel
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -185,7 +185,7 @@ MARC frameworks › Administration › Koha (if you select a value here, the indicators will be limited to the authorized value list)
    - + Cancel
    @@ -228,7 +228,7 @@ MARC frameworks › Administration › Koha [% END %] - + [% END %] @@ -250,7 +250,7 @@ MARC frameworks › Administration › Koha [% END %] [% END %] - +

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

    [% IF ( edit_matching_rule ) %] - + [% ELSE %] - + [% END %] Cancel
    --- 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 @@ -130,7 +130,7 @@
    - Cancel + Cancel
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/oai_sets.tt @@ -95,7 +95,7 @@
    - Cancel + Cancel
    [% ELSE %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/overdrive.tt @@ -62,7 +62,7 @@
    - +
    --- 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 @@ -246,7 +246,7 @@ Patron attribute types › Administration › Koha
    - + Cancel
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt @@ -60,7 +60,7 @@

    [% TAB.tab_title | html %] preferences

    - [% UNLESS ( searchfield ) %]
    [% END %] + [% UNLESS ( searchfield ) %]
    [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/restrictions.tt @@ -129,7 +129,7 @@
    - + Cancel
    @@ -147,7 +147,7 @@
    - + Cancel
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/share_content.tt @@ -105,7 +105,7 @@
    - +
    @@ -129,7 +129,7 @@
    - +
    @@ -149,7 +149,7 @@
    - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -97,7 +97,7 @@ - + [% END %] [% END %] @@ -434,7 +434,7 @@ - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sms_providers.tt @@ -99,8 +99,8 @@
    - - + + Cancel
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt @@ -137,7 +137,7 @@
    - + Cancel
    @@ -219,7 +219,7 @@
    - + Cancel
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping.tt @@ -67,7 +67,7 @@
    - + Cancel
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/sru_modmapping_auth.tt @@ -64,7 +64,7 @@
    - + Cancel
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt @@ -211,7 +211,7 @@ [% END %] -
    +
    [% IF ( return_tab ) %] Cancel [% ELSE %] @@ -293,7 +293,7 @@

    Data recorded

    - +
    [% END %] @@ -318,7 +318,7 @@ [% IF ( delete_confirmed ) %]

    Data deleted

    - +
    [% END %] --- 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 @@ -99,7 +99,7 @@
    - Cancel + Cancel
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt @@ -248,7 +248,7 @@
    - + Cancel
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt @@ -201,7 +201,7 @@
    -
    Cancel
    +
    Cancel
    [% END %] --