GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

This commit is contained in:
Evan Prodromou 2011-03-27 11:26:57 -04:00
parent c7defb32f9 1adaa6a2ab
commit 889b35be9c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/atompubmembershipfeed.php
View File

@ -141,7 +141,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
// TRANS: Title for group membership feed.
// TRANS: %s is a username.
$feed->setTitle(sprintf(_("%s group memberships"),
$feed->setTitle(sprintf(_('Group memberships of %s'),
$this->_profile->getBestName()));
// TRANS: Subtitle for group membership feed.

4
plugins/Comet/CometPlugin.php
View File

@ -111,7 +111,9 @@ class CometPlugin extends RealtimePlugin
'author' => 'Evan Prodromou',
'homepage' => 'http://status.net/wiki/Plugin:Comet',
'rawdescription' =>
_m('Plugin to do "real time" updates using Comet/Bayeux.'));
// TRANS: Plugin description message. Bayeux is a protocol for transporting asynchronous messages
// TRANS: and Comet is a web application model.
_m('Plugin to make updates using Comet and Bayeux.'));
return true;
}
}