Merge branch '0.8.x' into testing

Conflicts:
	actions/twitterauthorization.php
	lib/oauthclient.php
	lib/twitter.php
	lib/twitterapi.php
	lib/twitteroauthclient.php
	scripts/twitterstatusfetcher.php

1 files changed, 3 insertions, 2 deletions

diff --git a/actions/userrss.php b/actions/userrss.php
index 8a940865f..a9f3fd5f8 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -88,9 +88,10 @@ class UserrssAction extends Rss10Action
         $c = array('url' => common_local_url('userrss',
                                              array('nickname' =>
                                                    $user->nickname)),
-                   'title' => $user->nickname,
+                   'title' => sprintf(_('%s timeline'), $user->nickname),
                    'link' => $profile->profileurl,
-                   'description' => sprintf(_('Microblog by %s'), $user->nickname));
+                   'description' => sprintf(_('Updates from %1$s on %2$s!'),
+                                            $user->nickname, common_config('site', 'name')));
         return $c;
     }