diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-06-24 07:21:33 -0400 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2011-06-24 07:21:33 -0400 |
| commit | 5e02fd697fd15ae857aa0c2969fd9ea92043a55a (patch) | |
| tree | 3defb2dc56e726c314b4d92d43744faf4d52bd48 | |
| parent | a3a03a721f62bcf1426a475a543b0b1fcd322bcf (diff) | |
| download | elgg-5e02fd697fd15ae857aa0c2969fd9ea92043a55a.tar.gz elgg-5e02fd697fd15ae857aa0c2969fd9ea92043a55a.tar.bz2 | |
fixed the previous commit for the conflict
| -rw-r--r-- | languages/en.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/languages/en.php b/languages/en.php index 7649bcbc3..e7806be27 100644 --- a/languages/en.php +++ b/languages/en.php @@ -403,8 +403,7 @@ $english = array( * River */ 'river' => "River", - 'river:relationship:friend' => 'is now friends with', - 'friends:river:add' => "is now a friend with %s", + 'river:friend:user:default' => "%s is now a friend with %s", 'profile:river:iconupdate' => 'updated their profile icon', 'river:noaccess' => 'You do not have permission to view this item.', 'river:posted:generic' => '%s posted', |