From e56e27f5640f246e9baaa871bd121e03c22a7772 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@esilibrary.com>
Date: Mon, 5 May 2014 02:12:40 +0000
Subject: [PATCH] Bug 6739: (follow-up) tweak wording

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt    | 4 +++-
 .../intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt         | 2 +-
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt              | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
index 40898ad134..6a64c01b7b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt
@@ -209,7 +209,9 @@
                 <option value="0"> Don't block </option>
             [% END %]
         </select>
-        Should patrons of this category be blocked from opac actions such as renew and reserve when their cards have expired.
+        <span>
+            Choose whether patrons of this category be blocked from public catalog actions such as renewing and placing holds when their cards have expired.   
+        </span>
     </li>
     </ol>
 </fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index f16c0064ef..428f569ce1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -535,7 +535,7 @@ OPAC:
               choices:
                 yes: "Block"
                 no: "Don't block"
-            - expired patrons from opac actions such as placing a hold or renew, the setting for a patron category takes priority over this
+            - expired patrons from OPAC actions such as placing a hold or renewing.  Note that the setting for a patron category takes priority over this system preference.
 
     Privacy:
         -
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
index ffcac2fc84..e639c17a12 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
@@ -65,7 +65,7 @@
                         <div class="dialog alert">
                             <strong>Please note:</strong>
                             <span>
-                                Your account renewal failed because of the following:
+                                Your loan renewal failed because of the following reason(s):
                                 [% FOREACH error IN RENEW_ERROR.split('\|') %]
                                     [% IF error == 'card_expired' %]
                                         Your account has expired. Please contact the library for more information.
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
index 3bf227df48..445d4c7dd7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -108,7 +108,7 @@ var MSG_CONFIRM_RESUME_HOLDS  = _("Are you sure you want to resume all suspended
         <div class="dialog alert">
                 <strong>Please note:</strong>
                 <span>
-                    Your account renewal failed because of the following:
+                    Your loan renewal failed because of the following reason(s):
                     [% FOREACH error IN RENEW_ERROR.split('\|') %]
                         [% IF error == 'card_expired' %]
                             Your account has expired. Please contact the library for more information.
-- 
2.39.5