@@ -, +, @@ search "from existing record" => add order Category XXXX is in use. Deletion not possible! and Confirm deletion of category XXXX --- .../background_jobs/update_elastic_index.inc | 2 +- .../background_jobs_update_elastic_index.inc | 2 +- .../prog/en/includes/biblio-title-head.inc | 2 +- .../prog/en/includes/recalls.inc | 20 ++++---- .../prog/en/includes/transaction_types.inc | 4 +- .../prog/en/modules/acqui/addorderiso2709.tt | 20 ++++---- .../prog/en/modules/acqui/basket.tt | 8 +-- .../prog/en/modules/acqui/basketgroup.tt | 2 +- .../prog/en/modules/acqui/cancelorder.tt | 4 +- .../prog/en/modules/acqui/invoices.tt | 20 ++++---- .../prog/en/modules/acqui/neworderempty.tt | 8 +-- .../prog/en/modules/acqui/transferorder.tt | 2 +- .../en/modules/admin/additional-fields.tt | 4 +- .../prog/en/modules/admin/aqbudgets.tt | 4 +- .../modules/admin/auth_subfields_structure.tt | 8 +-- .../en/modules/admin/authorised_values.tt | 12 ++--- .../prog/en/modules/admin/authtypes.tt | 6 +-- .../prog/en/modules/admin/categories.tt | 12 ++--- .../prog/en/modules/admin/cities.tt | 6 +-- .../prog/en/modules/admin/columns_settings.tt | 8 +-- .../prog/en/modules/admin/credit_types.tt | 2 +- .../prog/en/modules/admin/debit_types.tt | 12 ++--- .../prog/en/modules/admin/itemtypes.tt | 6 +-- .../modules/admin/marc_subfields_structure.tt | 26 +++++----- .../prog/en/modules/admin/marctagstructure.tt | 12 ++--- .../en/modules/admin/patron-attr-types.tt | 8 +-- .../searchengine/elasticsearch/mappings.tt | 20 ++++---- .../prog/en/modules/admin/smart-rules.tt | 14 +++--- .../prog/en/modules/admin/smtp_servers.tt | 2 +- .../prog/en/modules/authorities/merge.tt | 10 ++-- .../prog/en/modules/basket/sendbasket.tt | 2 +- .../prog/en/modules/catalogue/advsearch.tt | 8 +-- .../prog/en/modules/catalogue/detail.tt | 44 ++++++++-------- .../prog/en/modules/catalogue/moredetail.tt | 16 +++--- .../prog/en/modules/catalogue/results.tt | 6 +-- .../en/modules/catalogue/stockrotation.tt | 8 +-- .../prog/en/modules/cataloguing/addbooks.tt | 10 ++-- .../value_builder/marc21_linking_section.tt | 2 +- .../value_builder/unimarc_field_210c.tt | 2 +- .../value_builder/unimarc_field_4XX.tt | 2 +- .../prog/en/modules/circ/article-requests.tt | 6 +-- .../prog/en/modules/circ/circulation.tt | 6 +-- .../prog/en/modules/circ/overdue.tt | 2 +- .../prog/en/modules/circ/request-article.tt | 10 ++-- .../prog/en/modules/circ/returns.tt | 16 +++--- .../prog/en/modules/circ/view_holdsqueue.tt | 12 ++--- .../prog/en/modules/clubs/clubs.tt | 8 +-- .../course_reserves/add_items-step2.tt | 4 +- .../modules/course_reserves/course-details.tt | 4 +- .../prog/en/modules/course_reserves/course.tt | 4 +- .../en/modules/labels/label-bib-search.tt | 2 +- .../prog/en/modules/labels/label-print.tt | 6 +-- .../en/modules/members/accountline-details.tt | 4 +- .../prog/en/modules/members/holdshistory.tt | 12 ++--- .../prog/en/modules/members/memberentrygen.tt | 16 +++--- .../prog/en/modules/members/moremember.tt | 14 +++--- .../prog/en/modules/members/notices.tt | 16 +++--- .../prog/en/modules/members/paycollect.tt | 20 ++++---- .../prog/en/modules/members/routing-lists.tt | 6 +-- .../prog/en/modules/patroncards/edit-batch.tt | 8 +-- .../en/modules/patroncards/edit-layout.tt | 4 +- .../prog/en/modules/patroncards/print.tt | 8 +-- .../modules/reports/guided_reports_start.tt | 14 +++--- .../prog/en/modules/reports/itemslost.tt | 4 +- .../prog/en/modules/reports/serials_stats.tt | 4 +- .../prog/en/modules/reserve/request.tt | 18 +++---- .../prog/en/modules/reviews/reviewswaiting.tt | 4 +- .../modules/rotating_collections/addItems.tt | 10 ++-- .../rotating_collections/editCollections.tt | 6 +-- .../prog/en/modules/serials/routing.tt | 4 +- .../en/modules/serials/serials-collection.tt | 24 ++++----- .../en/modules/serials/subscription-detail.tt | 24 ++++----- .../prog/en/modules/suggestion/suggestion.tt | 14 +++--- .../prog/en/modules/tags/review.tt | 44 ++++++++-------- .../en/modules/tools/additional-contents.tt | 10 ++-- .../automatic_item_modification_by_age.tt | 4 +- .../en/modules/tools/batch_delete_records.tt | 12 ++--- .../tools/batch_record_modification.tt | 10 ++-- .../prog/en/modules/tools/csv-profiles.tt | 18 +++---- .../prog/en/modules/tools/import_borrowers.tt | 34 ++++++------- .../prog/en/modules/tools/inventory.tt | 8 +-- .../en/modules/tools/manage-marc-import.tt | 16 +++--- .../tools/marc_modification_templates.tt | 36 ++++++------- .../prog/en/modules/tools/upload.tt | 4 +- .../prog/en/modules/tools/viewlog.tt | 4 +- .../en/modules/virtualshelves/sendshelf.tt | 2 +- .../bootstrap/en/includes/holds-table.inc | 10 ++-- .../bootstrap/en/includes/masthead.inc | 4 +- .../bootstrap/en/includes/shelfbrowser.inc | 6 +-- .../bootstrap/en/modules/maintenance.tt | 6 +-- .../en/modules/opac-account-pay-error.tt | 2 +- .../en/modules/opac-addbybiblionumber.tt | 8 +-- .../bootstrap/en/modules/opac-advsearch.tt | 8 +-- .../en/modules/opac-alert-subscribe.tt | 4 +- .../bootstrap/en/modules/opac-detail.tt | 4 +- .../en/modules/opac-full-serial-issues.tt | 24 ++++----- .../bootstrap/en/modules/opac-holdshistory.tt | 10 ++-- .../bootstrap/en/modules/opac-ics.tt | 4 +- .../bootstrap/en/modules/opac-library.tt | 2 +- .../bootstrap/en/modules/opac-main.tt | 8 +-- .../bootstrap/en/modules/opac-messaging.tt | 22 ++++---- .../bootstrap/en/modules/opac-passwd.tt | 10 ++-- .../en/modules/opac-password-recovery.tt | 14 +++--- .../bootstrap/en/modules/opac-recall.tt | 16 +++--- .../bootstrap/en/modules/opac-recalls.tt | 22 ++++---- .../bootstrap/en/modules/opac-reserve.tt | 26 +++++----- .../en/modules/opac-reset-password.tt | 16 +++--- .../bootstrap/en/modules/opac-sendbasket.tt | 4 +- .../en/modules/opac-serial-issues.tt | 50 +++++++++---------- .../bootstrap/en/modules/opac-shelves.tt | 10 ++-- .../bootstrap/en/modules/opac-showreviews.tt | 4 +- .../bootstrap/en/modules/opac-suggestions.tt | 18 +++---- .../bootstrap/en/modules/opac-tags.tt | 28 +++++------ .../bootstrap/en/modules/opac-user.tt | 32 ++++++------ .../bootstrap/en/modules/sco/sco-main.tt | 4 +- .../en/modules/text/explodedterms.tt | 6 +-- 116 files changed, 632 insertions(+), 632 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/update_elastic_index.inc @@ -10,7 +10,7 @@ [% ELSE %]
[% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs_update_elastic_index.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs_update_elastic_index.inc @@ -10,7 +10,7 @@ [% ELSE %] [% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title-head.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title-head.inc @@ -1,7 +1,7 @@ [%~ IF ( biblio.title ) ~%] [%~ biblio.title | html ~%] [%~ ELSE ~%] - No title + No title [%~ END ~%] [%~ biblio.medium | html ~%] [%~ FOREACH subtitle IN biblio.subtitle.split(' \| ') ~%][%~ IF Koha.Preference('marcflavour')=='UNIMARC' ~%],[%~ END ~%] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc @@ -55,7 +55,7 @@ [% IF ( recall.expiration_date ) %] [% recall.expiration_date | $KohaDates %] [% ELSIF ( !recall.completed ) %] - Never expires + Never expires [% ELSE %] - [% END %] @@ -67,28 +67,28 @@--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -575,12 +575,12 @@ Item types › Administration › Koha [% END %] [% IF library_limits.count > 1 %] - [% library_limits.count | html %] library limitations + [% library_limits.count | html %] library limitations [% ELSE %] - [% library_limits.count | html %] library limitation + [% library_limits.count | html %] library limitation [% END %] [% ELSE %] - No limitation + No limitation [% END %] | [% IF ( itemtype.automatic_checkin ) %]Yes[% ELSE %] [% END %] | --- 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 @@ -113,7 +113,7 @@ [% IF ( add_form ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
@@ -50,9 +50,9 @@ MARC frameworks › Administration › Koha
|
[% IF ( lengthunit == 'days' ) %] - Days + Days [% ELSIF ( lengthunit == 'hours') %] - Hours + Hours [% ELSE %] - Undefined + Undefined [% END %] |
@@ -1006,13 +1006,13 @@
[% IF ( not refundLostItemFeeRule ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smtp_servers.tt
@@ -240,7 +240,7 @@
[% IF error.code == 'WRONG_COUNT' %]
- Number of records provided for merging: [% error.value | html %]. Currently only 2 records can be merged at a time.
+ Number of records provided for merging: [% error.value | html %]. Currently only 2 records can be merged at a time.
[% ELSIF error.code == 'DESTRUCTIVE_MERGE' %]
- You cannot merge a record with itself. Please select two different authorities.
+ You cannot merge a record with itself. Please select two different authorities.
[% ELSIF error.code == 'WRONG_FRAMEWORK' %]
- The default framework cannot be used, or the framework does not exist. Please select another framework for merging.
+ The default framework cannot be used, or the framework does not exist. Please select another framework for merging.
[% ELSIF error.code == 'EMPTY_MARC' %]
- Sorry, but we did not find any MARC tags in the reference record.
+ Sorry, but we did not find any MARC tags in the reference record.
[% ELSIF error.code == 'MISSING_RECORD' %]
- Sorry, but we did not find a record for number: [% error.value | html %].
+ Sorry, but we did not find a record for number: [% error.value | html %].
[% ELSE %]
[% error | html %]
[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasket.tt
@@ -38,7 +38,7 @@ Your cart
[% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
- Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% END %]
+ Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% END %]
[% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
[% IF ( BIBLIO_RESULT.author ) %]; [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -182,10 +182,10 @@
[% FOREACH advsearchloo IN advancedsearchesloop %]
[% latestserial.planneddate | $KohaDates %] |
[% latestserial.publisheddate | $KohaDates %] |
- [% IF ( latestserial.status1 ) %]Expected[% END %]
- [% IF ( latestserial.status2 ) %]Arrived[% END %]
- [% IF ( latestserial.status3 ) %]Late[% END %]
- [% IF ( latestserial.status4 ) %]Missing[% END %]
- [% IF ( latestserial.status41 ) %]Missing (never received)[% END %]
- [% IF ( latestserial.status42 ) %]Missing (sold out)[% END %]
- [% IF ( latestserial.status43 ) %]Missing (damaged)[% END %]
- [% IF ( latestserial.status44 ) %]Missing (lost)[% END %]
- [% IF ( latestserial.status5 ) %]Not issued[% END %]
- [% IF ( latestserial.status6 ) %]Delete[% END %]
- [% IF ( latestserial.status7 ) %]Claimed[% END %]
- [% IF ( latestserial.status8 ) %]Stopped[% END %]
+ [% IF ( latestserial.status1 ) %]Expected[% END %]
+ [% IF ( latestserial.status2 ) %]Arrived[% END %]
+ [% IF ( latestserial.status3 ) %]Late[% END %]
+ [% IF ( latestserial.status4 ) %]Missing[% END %]
+ [% IF ( latestserial.status41 ) %]Missing (never received)[% END %]
+ [% IF ( latestserial.status42 ) %]Missing (sold out)[% END %]
+ [% IF ( latestserial.status43 ) %]Missing (damaged)[% END %]
+ [% IF ( latestserial.status44 ) %]Missing (lost)[% END %]
+ [% IF ( latestserial.status5 ) %]Not issued[% END %]
+ [% IF ( latestserial.status6 ) %]Delete[% END %]
+ [% IF ( latestserial.status7 ) %]Claimed[% END %]
+ [% IF ( latestserial.status8 ) %]Stopped[% END %]
|
[% latestserial.notes | html %] |
@@ -906,15 +906,15 @@ Note that permanent location is a code, and location may be an authval.
[% suggestion.fund.budget_name | html %]
|
- [% IF suggestion.STATUS == 'ASKED' %]Pending
- [% ELSIF suggestion.STATUS == 'ACCEPTED' %]Accepted
- [% ELSIF suggestion.STATUS == 'ORDERED' %]Ordered
- [% ELSIF suggestion.STATUS == 'REJECTED' %]Rejected
- [% ELSIF suggestion.STATUS == 'CHECKED' %]Checked
- [% ELSIF suggestion.STATUS == 'AVAILABLE' %]Available
+ [% IF suggestion.STATUS == 'ASKED' %]Pending
+ [% ELSIF suggestion.STATUS == 'ACCEPTED' %]Accepted
+ [% ELSIF suggestion.STATUS == 'ORDERED' %]Ordered
+ [% ELSIF suggestion.STATUS == 'REJECTED' %]Rejected
+ [% ELSIF suggestion.STATUS == 'CHECKED' %]Checked
+ [% ELSIF suggestion.STATUS == 'AVAILABLE' %]Available
[% ELSIF AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestion.STATUS ) %]
[% AuthorisedValues.GetByCode( 'SUGGEST_STATUS', suggestion.STATUS ) | html %]
- [% ELSE %]Status unknown
+ [% ELSE %]Status unknown
[% END %]
[% IF suggestion.reason %]
([% suggestion.reason | html %]) @@ -932,7 +932,7 @@ Note that permanent location is a code, and location may be an authval.
|