From: Ian Denhardt <ian@zenhack.net>
Date: Tue, 24 May 2011 01:50:48 +0000 (-0400)
Subject: Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline
X-Git-Url: https://git.mxchange.org/?p=quix0rs-gnu-social.git;a=commitdiff_plain;h=31b29fde50e9664e1b70064c043879ce87553883

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

Conflicts:
	plugins/OStatus/actions/ostatusinit.php
---

31b29fde50e9664e1b70064c043879ce87553883
diff --cc plugins/OStatus/actions/ostatusinit.php
index 7174e5c8a5,cba5ff57fc..78c559e579
--- a/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',