Confusing documentation and tooltip texts in Bookmark

diff --git a/plugins/Bookmark/actions/apitimelinebookmarks.php b/plugins/Bookmark/actions/apitimelinebookmarks.php
index 01ef20a8c83c4a6aa20f0ae2043c8548ac9c70c3..ee43617127630e4859cf2bce4229063f19db424f 100644 (file)
--- a/plugins/Bookmark/actions/apitimelinebookmarks.php
+++ b/plugins/Bookmark/actions/apitimelinebookmarks.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * Show a user's favorite notices
+ * Show a user's bookmark activities
  *
  * PHP version 5
  *
@@ -35,7 +35,7 @@ if (!defined('STATUSNET')) {
 }
 
 /**
- * Returns the 20 most recent favorite notices for the authenticating user or user
+ * Returns the most recent bookmark activities for the authenticating user or user
  * specified by the ID parameter in the requested format.
  *
  * @category API

diff --git a/plugins/Bookmark/actions/bookmarks.php b/plugins/Bookmark/actions/bookmarks.php
index 23ef0ec5fc1d5942256ae825b7a933e179b755e1..6c79fa1d024ecdacac30111a3780964f1455974e 100644 (file)
--- a/plugins/Bookmark/actions/bookmarks.php
+++ b/plugins/Bookmark/actions/bookmarks.php
@@ -145,13 +145,13 @@ class BookmarksAction extends Action
                                                     'id' => $this->user->nickname,
                                                     'format' => 'as')),
                               // TRANS: Feed link text. %s is a username.
-                              sprintf(_('Feed for favorites of %s (Activity Streams JSON)'),
+                              sprintf(_('Feed for bookmarks of %s (Activity Streams JSON)'),
                                       $this->user->nickname)),
                      new Feed(Feed::RSS1,
                               common_local_url('bookmarksrss',
                                                array('nickname' => $this->user->nickname)),
                               // TRANS: Feed link text. %s is a username.
-                              sprintf(_('Feed for favorites of %s (RSS 1.0)'),
+                              sprintf(_('Feed for bookmarks of %s (RSS 1.0)'),
                                       $this->user->nickname)),
                      new Feed(Feed::RSS2,
                               common_local_url('ApiTimelineBookmarks',
@@ -159,7 +159,7 @@ class BookmarksAction extends Action
                                                     'id' => $this->user->nickname,
                                                     'format' => 'rss')),
                               // TRANS: Feed link text. %s is a username.
-                              sprintf(_('Feed for favorites of %s (RSS 2.0)'),
+                              sprintf(_('Feed for bookmarks of %s (RSS 2.0)'),
                                       $this->user->nickname)),
                      new Feed(Feed::ATOM,
                               common_local_url('ApiTimelineBookmarks',
@@ -167,7 +167,7 @@ class BookmarksAction extends Action
                                                     'id' => $this->user->nickname,
                                                     'format' => 'atom')),
                               // TRANS: Feed link text. %s is a username.
-                              sprintf(_('Feed for favorites of %s (Atom)'),
+                              sprintf(_('Feed for bookmarks of %s (Atom)'),
                                       $this->user->nickname)));
     }