summaryrefslogtreecommitdiff
path: root/actions/allrss.php
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-08-06 22:45:09 -0400
committerCraig Andrews <candrews@integralblue.com>2009-08-06 22:45:09 -0400
commit91cba7a76f97a1669cbe9a2c2fa1b3e653786f26 (patch)
tree41b17a816862539845900c4d28ece7b638e6a77d /actions/allrss.php
parentaba2fcb45141929d9fdb0ec5e91e3aef8c44d709 (diff)
parentadc5901d21be286ff3459f2cd2bf4373625ac5e5 (diff)
Merge commit 'jeff-themovie/0.8.x-rss-1.0-descriptions' into 0.8.x
Diffstat (limited to 'actions/allrss.php')
-rw-r--r--actions/allrss.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/allrss.php b/actions/allrss.php
index 885a67f61..260667090 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -115,8 +115,8 @@ class AllrssAction extends Rss10Action
'link' => common_local_url('all',
array('nickname' =>
$user->nickname)),
- 'description' => sprintf(_('Feed for friends of %s'),
- $user->nickname));
+ 'description' => sprintf(_('Updates from %1$s and friends on %2$s!'),
+ $user->nickname, common_config('site', 'name')));
return $c;
}