Bug 21038: Reserves should be holds

This patch corrects the text of the warning about discharges cancelling
holds.

To test, apply the patch and view the discharge for a patron who has
holds:

 - "Borrower" is changed to "patron"
 - "reserves" is changed to "holds"
 - "canceled" (18 instances in the templates) is changed to "cancelled"
   (51 instances).

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
index 27a4cdd..f4a725b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt
@@ -35,7 +35,7 @@
     <p>Cannot edit discharge: the patron has checked out items.</p>
 [% ELSE %]
     [% IF patron.holds.count %]
-        <p>Borrower has reserves: they will be canceled if the discharge is generated.</p>
+        <p>Patron has holds. They will be cancelled if the discharge is generated.</p>
     [% END %]
     <form method="post">
         <input type="submit" value="Generate discharge" name="discharge" />