@@ -, +, @@ standards --- .../prog/en/modules/admin/preferences/acquisitions.pref | 4 ++++ .../prog/en/modules/admin/preferences/opac.pref | 12 ++++++++++++ .../prog/en/modules/admin/preferences/patrons.pref | 8 ++++++++ 3 files changed, 24 insertions(+) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref @@ -9,7 +9,11 @@ Acquisitions: receiving: receiving an order. cataloguing: cataloging the record. - +<<<<<<< Updated upstream - "The following database columns should be unique in an item:" +======= + - "The following database columns should be unique in an item:" +>>>>>>> Stashed changes - pref: UniqueItemFields - (separated by a space) - --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -728,17 +728,29 @@ OPAC: class: integer - "days." - +<<<<<<< Updated upstream - "The following database columns must be filled in on the patron entry screen:" +======= + - "The following database columns must be filled in on the patron entry screen:" +>>>>>>> Stashed changes - pref: PatronSelfRegistrationBorrowerMandatoryField class: multi - (separate columns with |) - +<<<<<<< Updated upstream - "The following database columns will not appear on the patron self-registration screen:" +======= + - "The following database columns will not appear on the patron self-registration screen:" +>>>>>>> Stashed changes - pref: PatronSelfRegistrationBorrowerUnwantedField class: multi - (separate columns with |) - +<<<<<<< Updated upstream - "The following database columns will not appear on the patron self-modification screen:" +======= + - "The following database columns will not appear on the patron self-modification screen:" +>>>>>>> Stashed changes - pref: PatronSelfModificationBorrowerUnwantedField class: multi - (separate columns with |) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref @@ -24,12 +24,20 @@ Patrons: no: "Don't" - default the card number field on the patron addition screen to the next available card number (for example, if the largest currently used card number is 26345000012941, then this field will default to 26345000012942). - +<<<<<<< Updated upstream - "The following database columns must be filled in on the patron entry screen:" +======= + - "The following database columns must be filled in on the patron entry screen:" +>>>>>>> Stashed changes - pref: BorrowerMandatoryField class: multi - (separate columns with |) - +<<<<<<< Updated upstream - "The following database columns will not appear on the patron entry screen:" +======= + - "The following database columns will not appear on the patron entry screen:" +>>>>>>> Stashed changes - pref: BorrowerUnwantedField class: multi - (separate columns with |) --