forked from GNUsocial/gnu-social
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
This commit is contained in:
commit
889b35be9c
@ -141,7 +141,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
|
|||||||
|
|
||||||
// TRANS: Title for group membership feed.
|
// TRANS: Title for group membership feed.
|
||||||
// TRANS: %s is a username.
|
// TRANS: %s is a username.
|
||||||
$feed->setTitle(sprintf(_("%s group memberships"),
|
$feed->setTitle(sprintf(_('Group memberships of %s'),
|
||||||
$this->_profile->getBestName()));
|
$this->_profile->getBestName()));
|
||||||
|
|
||||||
// TRANS: Subtitle for group membership feed.
|
// TRANS: Subtitle for group membership feed.
|
||||||
|
@ -111,7 +111,9 @@ class CometPlugin extends RealtimePlugin
|
|||||||
'author' => 'Evan Prodromou',
|
'author' => 'Evan Prodromou',
|
||||||
'homepage' => 'http://status.net/wiki/Plugin:Comet',
|
'homepage' => 'http://status.net/wiki/Plugin:Comet',
|
||||||
'rawdescription' =>
|
'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;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user