aboutsummaryrefslogtreecommitdiff
path: root/languages/en.php
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-10-29 15:10:48 -0700
committerBrett Profitt <brett.profitt@gmail.com>2011-10-29 15:10:48 -0700
commit6971caddb2245bec34fd23927f6f093e5b28c1ea (patch)
treea8c78a2b8f79201e04696687ad095e81eeee1805 /languages/en.php
parent3e4641537ff66b7e634f83e7a3386df9273ec9ff (diff)
parent9046723db0c21cd0995ec87e69734bd1f0edcae6 (diff)
downloadelgg-6971caddb2245bec34fd23927f6f093e5b28c1ea.tar.gz
elgg-6971caddb2245bec34fd23927f6f093e5b28c1ea.tar.bz2
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'languages/en.php')
-rw-r--r--languages/en.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/languages/en.php b/languages/en.php
index 3216be5e7..5af005814 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -425,6 +425,7 @@ $english = array(
'riveritem:plural:user' => 'some users',
'river:ingroup' => 'in the group %s',
'river:none' => 'No activity',
+ 'river:update' => 'Update for %s',
'river:widget:title' => "Activity",
'river:widget:description' => "Display latest activity",
@@ -1098,6 +1099,7 @@ If you requested this click on the link below, otherwise ignore this email.
'generic_comment:notdeleted' => "Sorry, we could not delete this comment.",
'generic_comment:failure' => "An unexpected error occurred when adding your comment. Please try again.",
'generic_comment:none' => 'No comments',
+ 'generic_comment:title' => 'Comment by %s',
'generic_comment:email:subject' => 'You have a new comment!',
'generic_comment:email:body' => "You have a new comment on your item \"%s\" from %s. It reads: