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

Conflicts:
	plugins/OStatus/actions/ostatusinit.php

diff --cc lib/action.php
Simple merge

diff --cc locale/ca/LC_MESSAGES/statusnet.po
Simple merge

diff --cc plugins/OStatus/actions/ostatusinit.php
index 7174e5c8a53c2071c71e950d78affd44e49246f1,cba5ff57fc984777911b1373eb5e63013a45512a..78c559e5799146dc0f26ca040a603f9365da469c
--- 1/plugins/OStatus/actions/ostatusinit.php
--- 2/plugins/OStatus/actions/ostatusinit.php
+++ b/plugins/OStatus/actions/ostatusinit.php
@@@ -93,16 -98,21 +98,22 @@@ class OStatusInitAction extends Actio
  
      function showContent()
      {
 +    
          if ($this->group) {
-             // TRANS: Form legend.
+             // TRANS: Form legend. %s is a group name.
              $header = sprintf(_m('Join group %s'), $this->group);
-             // TRANS: Button text.
+             // TRANS: Button text to join a group.
              $submit = _m('BUTTON','Join');
+         } else if ($this->peopletag && $this->tagger) {
+             // TRANS: Form legend. %1$s is a list, %2$s is a tagger's name.
+             $header = sprintf(_m('Subscribe to list %1$s by %2$s'), $this->peopletag, $this->tagger);
+             // TRANS: Button text to subscribe to a list.
+             $submit = _m('BUTTON','Subscribe');
+             // TRANS: Button text.
          } else {
-             // TRANS: Form legend.
+             // TRANS: Form legend. %s is a nickname.
              $header = sprintf(_m('Subscribe to %s'), $this->nickname);
-             // TRANS: Button text.
+             // TRANS: Button text to subscribe to a profile.
              $submit = _m('BUTTON','Subscribe');
          }
          $this->elementStart('form', array('id' => 'form_ostatus_connect',