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/groups/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/groups/languages/en.php')
| -rw-r--r-- | mod/groups/languages/en.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php index f2895db88..9f8bed9a4 100644 --- a/mod/groups/languages/en.php +++ b/mod/groups/languages/en.php @@ -213,10 +213,10 @@ or click below to view the group's join requests: Forum river items */ - 'groups:river:create' => 'created the group', - 'groups:river:join' => 'joined the group', - 'forumtopic:river:create' => 'added a new discussion topic', - 'groups:river:reply' => 'replied on the discussion topic', + 'river:create:group:default' => '%s created the group %s', + 'river:join:group:default' => '%s joined the group %s', + 'river:create:object:groupforumtopic' => '%s added a new discussion topic %s', + 'river:reply:object:groupforumtopic' => '%s replied on the discussion topic %s', 'groups:nowidgets' => 'No widgets have been defined for this group.', |