diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-06-24 07:13:18 -0400 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2011-06-24 07:13:18 -0400 |
| commit | a3a03a721f62bcf1426a475a543b0b1fcd322bcf (patch) | |
| tree | 4e6349bcf673d21e7513381b9acd1f832654fc02 /mod/bookmarks/languages/en.php | |
| parent | 344e47862b1f39eca19e39a000f97f799cc87a12 (diff) | |
| parent | cf85a49c7e74133feaec7d52d8f289d22b59a56c (diff) | |
| download | elgg-a3a03a721f62bcf1426a475a543b0b1fcd322bcf.tar.gz elgg-a3a03a721f62bcf1426a475a543b0b1fcd322bcf.tar.bz2 | |
Merge branch '3404-river-revamp' of https://github.com/ewinslow/Elgg into ewinslow-3404-river-revamp
Conflicts:
languages/en.php
Diffstat (limited to 'mod/bookmarks/languages/en.php')
| -rw-r--r-- | mod/bookmarks/languages/en.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/bookmarks/languages/en.php b/mod/bookmarks/languages/en.php index 42865f8cf..1d32a0344 100644 --- a/mod/bookmarks/languages/en.php +++ b/mod/bookmarks/languages/en.php @@ -35,10 +35,10 @@ $english = array( 'bookmarks:visit' => "Visit resource", 'bookmarks:recent' => "Recent bookmarks", - 'bookmarks:river:created' => 'bookmarked %s', + 'river:create:object:bookmarks' => '%s bookmarked %s', + 'river:comment:object:bookmarks' => '%s commented on a bookmark %s', 'bookmarks:river:annotate' => 'a comment on this bookmark', 'bookmarks:river:item' => 'an item', - 'river:commented:object:bookmarks' => 'a bookmark', 'item:object:bookmarks' => 'Bookmarks', |