From b6c756cace492b48372adf3ca969dc8cff7c3f76 Mon Sep 17 00:00:00 2001
From: Stoob <stuart@korlon.com>
Date: Fri, 12 May 2017 09:28:26 -0700
Subject: [PATCH 1/2] CRM-20563 change fatal error message

CRM-10293 and CRM-20563
---
 templates/CRM/common/fatal.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/CRM/common/fatal.tpl b/templates/CRM/common/fatal.tpl
index 7f04a029d58b..fa87f3895997 100644
--- a/templates/CRM/common/fatal.tpl
+++ b/templates/CRM/common/fatal.tpl
@@ -47,7 +47,7 @@
   </style>
 {/if}
 <div class="messages status no-popup">  <i class="crm-i fa-exclamation-triangle crm-i-red"></i>
- <span class="status-fatal">{ts}Sorry but we are not able to provide this at the moment.{/ts}</span>
+ <span class="status-fatal">{ts}Sorry, due to an error, CiviCRM is unable to fulfill your request at the moment. You may want to contact your administrator or service provider with more details about when this occurred.{/ts}</span>
     <div class="crm-section crm-error-message">{$message}</div>
     {if $error.message && $message != $error.message}
         <hr style="solid 1px" />

From 4de0cf124943daaf235370c5dfddc45b89b6f161 Mon Sep 17 00:00:00 2001
From: Stoob <stuart@korlon.com>
Date: Fri, 19 May 2017 15:55:19 -0700
Subject: [PATCH 2/2] final text changes

---
 templates/CRM/common/fatal.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/CRM/common/fatal.tpl b/templates/CRM/common/fatal.tpl
index fa87f3895997..bcca126c482d 100644
--- a/templates/CRM/common/fatal.tpl
+++ b/templates/CRM/common/fatal.tpl
@@ -47,7 +47,7 @@
   </style>
 {/if}
 <div class="messages status no-popup">  <i class="crm-i fa-exclamation-triangle crm-i-red"></i>
- <span class="status-fatal">{ts}Sorry, due to an error, CiviCRM is unable to fulfill your request at the moment. You may want to contact your administrator or service provider with more details about when this occurred.{/ts}</span>
+ <span class="status-fatal">{ts}Sorry, due to an error, we are unable to fulfill your request at the moment. You may want to contact your administrator or service provider with more details about what action you were performing when this occurred.{/ts}</span>
     <div class="crm-section crm-error-message">{$message}</div>
     {if $error.message && $message != $error.message}
         <hr style="solid 1px" />