From 7132ac1fb74f6fb658233b2166fad9c8d1c840b0 Mon Sep 17 00:00:00 2001
From: "Donald A. Lobo" <lobo@civicrm.org>
Date: Mon, 13 May 2013 10:34:34 -0700
Subject: [PATCH] CRM-12594

----------------------------------------
* CRM-12594:
  http://issues.civicrm.org/jira/browse/CRM-12594
---
 CRM/UF/Form/Field.php                 | 2 +-
 templates/CRM/ACL/Form/EntityRole.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/UF/Form/Field.php b/CRM/UF/Form/Field.php
index 3cabefb3c1..bde9c82a7e 100644
--- a/CRM/UF/Form/Field.php
+++ b/CRM/UF/Form/Field.php
@@ -873,7 +873,7 @@ class CRM_UF_Form_Field extends CRM_Core_Form {
         if (in_array('Membership', $groupType) || in_array('Contribution', $groupType)
           || in_array('Organization', $groupType) || in_array('Household', $groupType) || in_array('Activity', $groupType)
         ) {
-          $errors['field_name'] = ts('Cannot add or update profile field type Participant with combination of Activity or Membership or Contribution or Household or Organization or Activity');
+          $errors['field_name'] = ts('Cannot add or update profile field type Participant with combination of Activity or Membership or Contribution or Household or Organization.');
         }
         else {
           self::formRuleSubType($fieldType, $groupType, $errors);
diff --git a/templates/CRM/ACL/Form/EntityRole.tpl b/templates/CRM/ACL/Form/EntityRole.tpl
index a8ea46eeee..5bd193cb5f 100644
--- a/templates/CRM/ACL/Form/EntityRole.tpl
+++ b/templates/CRM/ACL/Form/EntityRole.tpl
@@ -43,7 +43,7 @@
       <tr class="crm-acl-entityrole-form-block-entity_id">
          <td class="label">{$form.entity_id.label}</td>
          <td>{$form.entity_id.html}<br />
-            <span class="description">{ts}Select a group of contacts who should have this role when logged in to your site. Groups must be assigned the 'Access Control' type (Manage Groups &raquo; Settings) to be included in this list.{/ts}</span>
+            <span class="description">{ts}Select a group of contacts who should have this role when logged in to your site. Groups must be assigned the 'Access Control' type (Contacts &raquo; Manage Groups &raquo; Settings) to be included in this list.{/ts}</span>
          </td>
       <tr class="crm-acl-entityrole-form-block-is_active">
          <td class="label">{$form.is_active.label}</td>
-- 
2.25.1