Merge branch '0.9.x' into 1.0.x

This commit is contained in:
Brion Vibber
2010-10-05 11:40:49 -07:00
187 changed files with 8859 additions and 685 deletions

View File

@@ -653,7 +653,7 @@ class OStatusPlugin extends Plugin
$act->title = _m("Join");
// TRANS: Success message for subscribe to group attempt through OStatus.
// TRANS: %1$s is the member name, %2$s is the subscribed group's name.
$act->content = sprintf(_m("%1$s has joined group %2$s."),
$act->content = sprintf(_m('%1$s has joined group %2$s.'),
$member->getBestName(),
$oprofile->getBestName());
@@ -705,7 +705,7 @@ class OStatusPlugin extends Plugin
$act->title = _m("Leave");
// TRANS: Success message for unsubscribe from group attempt through OStatus.
// TRANS: %1$s is the member name, %2$s is the unsubscribed group's name.
$act->content = sprintf(_m("%1$s has left group %2$s."),
$act->content = sprintf(_m('%1$s has left group %2$s.'),
$member->getBestName(),
$oprofile->getBestName());