Merge branch 'tagprofile-ajax-fix' into 'nightly'

[quix0rs-gnu-social.git] / plugins / OStatus / actions / ostatuspeopletag.php

diff --git a/plugins/OStatus/actions/ostatuspeopletag.php b/plugins/OStatus/actions/ostatuspeopletag.php
index 1a8495ce213aa4c725e0cf7e9fbe8aad96451ebe..96a55142f825afa08effff76f4d3381135ffb39c 100644 (file)
--- a/plugins/OStatus/actions/ostatuspeopletag.php
+++ b/plugins/OStatus/actions/ostatuspeopletag.php
@@ -70,13 +70,16 @@ class OStatusPeopletagAction extends OStatusSubAction
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->input('profile',
-                     _m('Subscribe to people tag'),
+                     // TRANS: Field label.
+                     _m('Subscribe to list'),
                      $this->profile_uri,
-                     _m("Address of the OStatus people tag, like http://example.net/user/all/tag"));
+                     // TRANS: Field title.
+                     _m("Address of the OStatus list, like http://example.net/user/all/tag."));
         $this->elementEnd('li');
         $this->elementEnd('ul');
 
-        $this->submit('validate', _m('Continue'));
+        // TRANS: Button text to continue joining a remote list.
+        $this->submit('validate', _m('BUTTON','Continue'));
 
         $this->elementEnd('fieldset');
 
@@ -95,7 +98,8 @@ class OStatusPeopletagAction extends OStatusSubAction
         $cur = common_current_user();
         if ($ptag->hasSubscriber($cur->id)) {
             $this->element('div', array('class' => 'error'),
-                           _m('You are already subscribed to this people tag.'));
+                           // TRANS: Error text displayed when trying to subscribe to a list already a subscriber to.
+                           _m('You are already subscribed to this list.'));
             $ok = false;
         } else {
             $ok = true;
@@ -157,8 +161,8 @@ class OStatusPeopletagAction extends OStatusSubAction
 
     function title()
     {
-        // TRANS: Page title for OStatus remote people tag subscription form
-        return _m('Confirm subscription to remote people tag');
+        // TRANS: Page title for OStatus remote list subscription form
+        return _m('Confirm subscription to remote list');
     }
 
     /**
@@ -169,7 +173,8 @@ class OStatusPeopletagAction extends OStatusSubAction
 
     function getInstructions()
     {
-        return _m('You can subscribe to lists from other supported sites. Paste the lists\'s URI below:');
+        // TRANS: Instructions for OStatus list subscription form.
+        return _m('You can subscribe to lists from other supported sites. Paste the list\'s URI below:');
     }
 
     function selfLink()