We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 889b35be authored by Evan Prodromou's avatar Evan Prodromou

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

parents c7defb32 1adaa6a2
......@@ -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'),
// TRANS: Subtitle for group membership feed.
......@@ -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;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment