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 /languages | |
| 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 'languages')
| -rw-r--r-- | languages/en.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/languages/en.php b/languages/en.php index 2e76ee2e7..7649bcbc3 100644 --- a/languages/en.php +++ b/languages/en.php @@ -410,7 +410,7 @@ $english = array( '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", |