diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-03 09:53:38 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-03 09:53:38 -0800 |
commit | 7313cd909479f771e960466d9194783c9a3158bb (patch) | |
tree | 318734efe06c9de904364f04cb76e1c54b75e269 /plugins/OStatus/actions/ostatussub.php | |
parent | 49a872b56f82a3f1ba59f0751c11dfe7754393dd (diff) | |
parent | f3cea2430497e751bc7776fe3abf0603e2b55f8b (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline
Conflicts:
plugins/OStatus/OStatusPlugin.php
Diffstat (limited to 'plugins/OStatus/actions/ostatussub.php')
-rw-r--r-- | plugins/OStatus/actions/ostatussub.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php index f45e6a8d1..e318701a2 100644 --- a/plugins/OStatus/actions/ostatussub.php +++ b/plugins/OStatus/actions/ostatussub.php @@ -112,7 +112,7 @@ class OStatusSubAction extends Action $this->submit('submit', _m('Join'), 'submit', null, _m('Join this group')); } else { - $this->submit('submit', _m('Subscribe'), 'submit', null, + $this->submit('submit', _m('Confirm'), 'submit', null, _m('Subscribe to this user')); } $this->elementEnd('fieldset'); |