aboutsummaryrefslogtreecommitdiff
path: root/languages
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-07-13 22:23:52 -0400
committerCash Costello <cash.costello@gmail.com>2012-07-13 22:23:52 -0400
commit54bc5844dfe6cb684c7aecaf1be5ee8071d98fe0 (patch)
tree90f4166d6cd605eb4d7e95d63682732a1c5476a5 /languages
parent695651451b262c526d6aaf9d0988ce557ff50e95 (diff)
parent894ea6758f3f99c49807df99ef4bbd95f74273dc (diff)
downloadelgg-54bc5844dfe6cb684c7aecaf1be5ee8071d98fe0.tar.gz
elgg-54bc5844dfe6cb684c7aecaf1be5ee8071d98fe0.tar.bz2
Merged notifications update from Brett's fork
Diffstat (limited to 'languages')
-rw-r--r--languages/en.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/languages/en.php b/languages/en.php
index dc109dd05..69ba9d245 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -219,8 +219,7 @@ The photo can be viewed here: %s",
// river
'river:create:object:image' => "%s uploaded the photo %s",
- 'river:create:object:tidypics_batch' => "%s uploaded some photos",
- 'image:river:created' => "%s added the photo %s to the album %s",
+ 'image:river:created' => "%s added a photo to the album %s",
'image:river:created:multiple' => "%s added %u photos to the album %s",
'image:river:item' => "a photo",
'image:river:annotate' => "a comment on the photo",
@@ -234,8 +233,9 @@ The photo can be viewed here: %s",
'river:comment:object:album' => '%s commented on the album %s',
// notifications
- 'tidypics:newalbum' => 'New photo album',
-
+ 'tidypics:newalbum_subject' => 'New photo album',
+ 'tidypics:newalbum' => '%s created a new photo album',
+ 'tidypics:updatealbum' => "%s uploaded new photos to the album %s",
// Status messages
'tidypics:upl_success' => "Your images uploaded successfully.",