From a225fe12ba1b98b866f47e58c070b614a001aab5 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 18 Apr 2011 23:41:53 +0000
Subject: [PATCH] - user web and notices: fix message describing friend request

svn path=/trunk/boinc/; revision=23378
---
 checkin_notes       | 6 ++++++
 html/inc/friend.inc | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 550f036f78..aa24c3811e 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2300,3 +2300,9 @@ David  18 Apr 2011
     client/
         client_state.cpp
         app_start.cpp
+
+David  18 Apr 2011
+    - user web and notices: fix message describing friend request
+
+    html/inc/
+        friend.inc
diff --git a/html/inc/friend.inc b/html/inc/friend.inc
index 66ec14922b..1a84e01445 100644
--- a/html/inc/friend.inc
+++ b/html/inc/friend.inc
@@ -21,7 +21,7 @@
 function friend_notify_req_email_line($notify) {
     $src_user = BoincUser::lookup_id($notify->opaque);
     if (!$src_user) return "";
-    return "$src_user->name has added you as a friend; please confirm";
+    return "$src_user->name has requested friendship with you. Please accept or decline.";
 }
 
 function friend_notify_accept_email_line($notify) {
@@ -94,7 +94,7 @@ Do not reply to this message.
 function friend_req_rss($notify, &$title, &$msg, &$url) {
     $src_user = BoincUser::lookup_id($notify->opaque);
     $title = "Friend request";
-    $msg = "$src_user->name has added you as a friend; please confirm or decline";
+    $msg = "$src_user->name has requested friendship with you. Please accept or decline.";
     $url = URL_BASE."friend.php?action=query&userid=$notify->opaque";
 }