aboutsummaryrefslogtreecommitdiff
path: root/languages
diff options
context:
space:
mode:
authorcash <cash.costello@gmail.com>2011-06-24 13:42:07 -0400
committercash <cash.costello@gmail.com>2011-06-24 13:42:07 -0400
commit3c2f72753335a5ca793cf8250c4233d04689e5d2 (patch)
tree43fb542574f791bc47546e65e24f858c3eec0698 /languages
parent42e02f03c306717002aac0d36f0e2b48bf369fed (diff)
parentd701c3bdf59e2d326c27dd0567323e09a65c00f2 (diff)
downloadelgg-3c2f72753335a5ca793cf8250c4233d04689e5d2.tar.gz
elgg-3c2f72753335a5ca793cf8250c4233d04689e5d2.tar.bz2
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'languages')
-rw-r--r--languages/en.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/languages/en.php b/languages/en.php
index 2e76ee2e7..e7806be27 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -403,14 +403,13 @@ $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',
'riveritem:single:user' => 'a user',
'riveritem:plural:user' => 'some users',
- 'river:ingroup' => 'to the group %s',
+ 'river:ingroup' => 'in the group %s',
'river:none' => 'No activity',
'river:widget:title' => "Activity",