Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x

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

diff --git a/plugins/OStatus/actions/ostatustag.php b/plugins/OStatus/actions/ostatustag.php
index 85ead81ca2f8f70c0b43fed80b8a52d8d0d4dc17..b94dec12ebffa14e0cd0d20e943d2939356aaeca 100644 (file)
--- a/plugins/OStatus/actions/ostatustag.php
+++ b/plugins/OStatus/actions/ostatustag.php
@@ -27,7 +27,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class OStatusTagAction extends OStatusInitAction
 {
-
     var $nickname;
     var $profile;
     var $err;
@@ -37,7 +36,8 @@ class OStatusTagAction extends OStatusInitAction
         parent::prepare($args);
 
         if (common_logged_in()) {
-            $this->clientError(_m('You can use the local tagging!'));
+            // TRANS: Client error displayed when trying to list a local object as if it is remote.
+            $this->clientError(_m('You can use the local list functionality!'));
             return false;
         }
 
@@ -51,8 +51,10 @@ class OStatusTagAction extends OStatusInitAction
 
     function showContent()
     {
-        $header = sprintf(_m('Tag %s'), $this->nickname);
-        $submit = _m('Go');
+        // TRANS: Header for listing a remote object. %s is a remote object's name.
+        $header = sprintf(_m('List %s'), $this->nickname);
+        // TRANS: Button text to list a remote object.
+        $submit = _m('BUTTON','Go');
         $this->elementStart('form', array('id' => 'form_ostatus_connect',
                                           'method' => 'post',
                                           'class' => 'form_settings',
@@ -63,12 +65,16 @@ class OStatusTagAction extends OStatusInitAction
 
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li', array('id' => 'ostatus_nickname'));
+        // TRANS: Field label.
         $this->input('nickname', _m('User nickname'), $this->nickname,
-                     _m('Nickname of the user you want to tag'));
+                     // TRANS: Field title.
+                     _m('Nickname of the user you want to list.'));
         $this->elementEnd('li');
         $this->elementStart('li', array('id' => 'ostatus_profile'));
+        // TRANS: Field label.
         $this->input('profile', _m('Profile Account'), $this->profile,
-                     _m('Your account id (i.e. user@identi.ca)'));
+                     // TRANS: Field title.
+                     _m('Your account id (for example user@identi.ca).'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('submit', $submit);
@@ -83,7 +89,8 @@ class OStatusTagAction extends OStatusInitAction
         $disco = new Discovery;
         $result = $disco->lookup($acct);
         if (!$result) {
-            $this->clientError(_m("Couldn't look up OStatus account profile."));
+            // TRANS: Client error displayed when remote profile could not be looked up.
+            $this->clientError(_m('Could not look up OStatus account profile.'));
         }
 
         foreach ($result->links as $link) {
@@ -95,7 +102,8 @@ class OStatusTagAction extends OStatusInitAction
             }
 
         }
-        $this->clientError(_m("Couldn't confirm remote profile address."));
+        // TRANS: Client error displayed when remote profile address could not be confirmed.
+        $this->clientError(_m('Could not confirm remote profile address.'));
     }
 
     function connectProfile($subscriber_profile)
@@ -112,6 +120,7 @@ class OStatusTagAction extends OStatusInitAction
 
     function title()
     {
-      return _m('OStatus people tag');  
+      // TRANS: Title for an OStatus list.
+      return _m('OStatus list');  
     }
 }