From ce1736123f8a2a092a0cab13fbd76b7a1233c4aa Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Mon, 25 Jun 2018 08:42:16 +0200 Subject: [PATCH] Bug 20988: koha-tmpl/intranet-tmpl/prog/en/includes --- .../prog/en/includes/account_offset_type.inc | 11 +- .../prog/en/includes/accounttype.inc | 43 +-- .../includes/acquisitions-add-to-basket.inc | 21 +- .../prog/en/includes/acquisitions-menu.inc | 27 +- .../prog/en/includes/acquisitions-search.inc | 19 +- .../prog/en/includes/acquisitions-toolbar.inc | 17 +- .../admin-items-search-field-form.inc | 21 +- .../prog/en/includes/admin-menu.inc | 83 ++--- .../prog/en/includes/adv-search.inc | 15 +- .../prog/en/includes/auth-finder-search.inc | 107 +++--- .../includes/authorities-search-results.inc | 45 +-- .../prog/en/includes/authorities-search.inc | 121 +++---- .../prog/en/includes/authorities-toolbar.inc | 21 +- .../prog/en/includes/authorities.inc | 5 +- .../prog/en/includes/av-build-dropbox.inc | 5 +- .../prog/en/includes/biblio-view-menu.inc | 23 +- .../prog/en/includes/blocked-fines.inc | 11 +- .../prog/en/includes/blocking_errors.inc | 5 +- .../prog/en/includes/borrower_debarments.inc | 41 +-- .../prog/en/includes/branch-selector.inc | 3 +- .../en/includes/budgets-active-currency.inc | 9 +- .../prog/en/includes/budgets-admin-search.inc | 25 +- .../en/includes/budgets-admin-toolbar.inc | 25 +- .../prog/en/includes/cat-menu.inc | 3 +- .../prog/en/includes/cat-search.inc | 19 +- .../prog/en/includes/cat-toolbar.inc | 101 +++--- .../prog/en/includes/cataloging-search.inc | 23 +- .../catalogue/itemsearch_item.csv.inc | 3 +- .../catalogue/itemsearch_item.json.inc | 7 +- .../en/includes/cateditor-widgets-marc21.inc | 121 +++---- .../prog/en/includes/checkin-search.inc | 15 +- .../en/includes/checkouts-table-footer.inc | 7 +- .../prog/en/includes/checkouts-table.inc | 59 ++-- .../prog/en/includes/circ-menu.inc | 45 +-- .../prog/en/includes/circ-nav.inc | 35 +- .../includes/circ-patron-search-results.inc | 19 +- .../prog/en/includes/circ-search.inc | 19 +- .../prog/en/includes/cities-admin-search.inc | 17 +- .../en/includes/contracts-admin-search.inc | 17 +- .../en/includes/csv_headers/acqui/basket.tt | 3 +- .../includes/csv_headers/acqui/basketgroup.tt | 3 +- .../includes/csv_headers/acqui/lateorders.tt | 3 +- .../csv_headers/catalogue/itemsearch.tt | 3 +- .../reports/cash_register_stats.tt | 3 +- .../csv_headers/reports/orders_by_budget.tt | 3 +- .../en/includes/currencies-admin-search.inc | 17 +- .../prog/en/includes/date-format.inc | 3 +- .../prog/en/includes/delimiter_text.inc | 13 +- .../intranet-tmpl/prog/en/includes/facets.inc | 37 +- .../prog/en/includes/form-blocks.inc | 4 +- .../prog/en/includes/guided-reports-view.inc | 15 +- .../intranet-tmpl/prog/en/includes/header.inc | 67 ++-- .../prog/en/includes/help-top.inc | 3 +- .../prog/en/includes/home-search.inc | 25 +- .../prog/en/includes/ill-toolbar.inc | 13 +- .../prog/en/includes/labels-toolbar.inc | 21 +- .../prog/en/includes/langmenu-staff-top.inc | 11 +- .../prog/en/includes/letters-search.inc | 17 +- .../includes/member-alt-address-style-de.inc | 51 +-- .../includes/member-alt-address-style-fr.inc | 51 +-- .../includes/member-alt-address-style-us.inc | 51 +-- .../includes/member-alt-contact-style-de.inc | 39 +-- .../includes/member-alt-contact-style-fr.inc | 39 +-- .../includes/member-alt-contact-style-us.inc | 39 +-- .../includes/member-main-address-style-de.inc | 37 +- .../includes/member-main-address-style-fr.inc | 37 +- .../includes/member-main-address-style-us.inc | 37 +- .../prog/en/includes/members-menu.inc | 21 +- .../prog/en/includes/members-toolbar.inc | 79 ++--- .../prog/en/includes/merge-record.inc | 7 +- .../en/includes/messaging-preference-form.inc | 107 ++---- .../modals/serials_multi_receiving.inc | 11 +- .../prog/en/includes/nl-search-form.tt | 3 +- .../prog/en/includes/noadd-warnings.inc | 7 +- .../prog/en/includes/onboarding_messages.inc | 33 +- .../prog/en/includes/page-numbers.inc | 11 +- .../en/includes/patron-article-requests.inc | 37 +- .../prog/en/includes/patron-search-box.inc | 3 +- .../prog/en/includes/patron-search.inc | 85 ++--- .../prog/en/includes/patron-title.inc | 3 +- .../prog/en/includes/patron-toolbar.inc | 11 +- .../prog/en/includes/patroncards-errors.inc | 55 +-- .../prog/en/includes/patroncards-toolbar.inc | 25 +- .../prog/en/includes/patrons-admin-search.inc | 17 +- .../prog/en/includes/permissions.inc | 217 ++++++------ .../prog/en/includes/prefs-admin-search.inc | 15 +- .../prog/en/includes/prefs-menu.inc | 33 +- .../prog/en/includes/quotes-toolbar.inc | 7 +- .../en/includes/quotes-upload-toolbar.inc | 7 +- .../prog/en/includes/reports-menu.inc | 53 +-- .../prog/en/includes/reports-toolbar.inc | 39 +-- .../prog/en/includes/resort_form.inc | 61 ++-- .../includes/rotating-collections-toolbar.inc | 9 +- .../prog/en/includes/search_indexes.inc | 67 ++-- .../prog/en/includes/serials-menu.inc | 17 +- .../prog/en/includes/serials-search.inc | 25 +- .../prog/en/includes/serials-toolbar.inc | 29 +- .../prog/en/includes/subscriptions-search.inc | 17 +- .../prog/en/includes/subtypes_unimarc.inc | 321 +++++++++--------- .../en/includes/suggestions-add-search.inc | 23 +- .../prog/en/includes/tools-item-action.inc | 11 +- .../prog/en/includes/tools-menu.inc | 77 ++--- .../prog/en/includes/tools-nomatch-action.inc | 5 +- .../prog/en/includes/tools-overlay-action.inc | 9 +- .../prog/en/includes/vendor-menu.inc | 13 +- .../en/includes/virtualshelves-toolbar.inc | 23 +- .../virtualshelves/merge/selection.tt | 3 +- .../prog/en/includes/z3950-admin-search.inc | 17 +- 108 files changed, 1765 insertions(+), 1706 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc index a36a883a86..3c2c520a33 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/account_offset_type.inc @@ -1,8 +1,9 @@ +[% PROCESS 'i18n.inc' %] [% SWITCH account_offset.type %] - [% CASE 'Payment' %]Payment - [% CASE 'Manual Debit' %]Manual invoice - [% CASE 'Lost Item Return' %]Lost item returned - [% CASE 'Writeoff' %]Writeoff - [% CASE 'Void Payment' %]Void payment + [% CASE 'Payment' %][% t('Payment') %] + [% CASE 'Manual Debit' %][% t('Manual invoice') %] + [% CASE 'Lost Item Return' %][% t('Lost item returned') %] + [% CASE 'Writeoff' %][% t('Writeoff') %] + [% CASE 'Void Payment' %][% t('Void payment') %] [% CASE %][% account_offset.type %] [%- END -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc index 7d7cdc6109..80595842f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/accounttype.inc @@ -1,24 +1,25 @@ +[% PROCESS 'i18n.inc' %] [% SWITCH account.accounttype %] - [% CASE 'Pay' %]Payment, thanks - [% CASE 'Pay00' %]Payment, thanks (cash via SIP2) - [% CASE 'Pay01' %]Payment, thanks (VISA via SIP2) - [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2) - [% CASE 'VOID' %]Payment, Voided - [% CASE 'N' %]New card - [% CASE 'F' %]Fine - [% CASE 'A' %]Account management fee - [% CASE 'M' %]Sundry - [% CASE 'L' %]Lost item - [% CASE 'W' %]Writeoff - [% CASE 'FU' %]Accruing fine - [% CASE 'HE' %]Hold waiting too long - [% CASE 'Rent' %]Rental fee - [% CASE 'FOR' %]Forgiven - [% CASE 'LR' %]Lost item fee refund - [% CASE 'PF' %]Processing fee - [% CASE 'PAY' %]Payment - [% CASE 'WO' %]Writeoff - [% CASE 'C' %]Credit - [% CASE 'CR' %]Credit + [% CASE 'Pay' %][% t('Payment, thanks') %] + [% CASE 'Pay00' %][% t('Payment, thanks (cash via SIP2)') %] + [% CASE 'Pay01' %][% t('Payment, thanks (VISA via SIP2)') %] + [% CASE 'Pay02' %][% t('Payment, thanks (credit card via SIP2)') %] + [% CASE 'VOID' %][% t('Payment, Voided') %] + [% CASE 'N' %][% t('New card') %] + [% CASE 'F' %][% t('Fine') %] + [% CASE 'A' %][% t('Account management fee') %] + [% CASE 'M' %][% t('Sundry') %] + [% CASE 'L' %][% t('Lost item') %] + [% CASE 'W' %][% t('Writeoff') %] + [% CASE 'FU' %][% t('Accruing fine') %] + [% CASE 'HE' %][% t('Hold waiting too long') %] + [% CASE 'Rent' %][% t('Rental fee') %] + [% CASE 'FOR' %][% t('Forgiven') %] + [% CASE 'LR' %][% t('Lost item fee refund') %] + [% CASE 'PF' %][% t('Processing fee') %] + [% CASE 'PAY' %][% t('Payment') %] + [% CASE 'WO' %][% t('Writeoff') %] + [% CASE 'C' %][% t('Credit') %] + [% CASE 'CR' %][% t('Credit') %] [% CASE %][% account.accounttype %] [%- END -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc index 8e2961b6df..7c7bbfbc46 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc @@ -1,27 +1,28 @@ +[% PROCESS 'i18n.inc' %]
- Add order to basket + [% t('Add order to basket') %] [% IF has_budgets %] [% ELSE %]
-

You can't create any orders unless you first define a budget and a fund.

+

[% t('You can\'t create any orders unless you first') %] [% t('define a budget and a fund') %].

[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc index 8d46d87939..4303738b19 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc @@ -1,29 +1,30 @@ +[% PROCESS 'i18n.inc' %]