tag -> list

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 36259b8abbe3c77b070204a2ea6b73c8e4eef650..1c99db870091e1dd55d47a1358ec59a71a0b2f46 100644 (file)
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -293,7 +293,7 @@ class OStatusPlugin extends Plugin
 
         $action->elementStart('fieldset');
         // TRANS: Fieldset legend.
-        $action->element('legend', null, _m('Tag remote profile'));
+        $action->element('legend', null, _m('List remote profile'));
         $action->hidden('token', common_session_token());
 
         $user = common_current_user();
@@ -883,7 +883,7 @@ class OStatusPlugin extends Plugin
             // TRANS: Title for following a remote list.
             $act->title = _m('TITLE','Follow list');
             // TRANS: Success message for remote list follow through OStatus.
-            // TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
+            // TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
             $act->content = sprintf(_m('%1$s is now following people listed in %2$s by %3$s.'),
                                     $sub->getBestName(),
                                     $oprofile->getBestName(),
@@ -933,7 +933,7 @@ class OStatusPlugin extends Plugin
             // TRANS: Title for unfollowing a remote list.
             $act->title = _m('Unfollow list');
             // TRANS: Success message for remote list unfollow through OStatus.
-            // TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the tagger's name.
+            // TRANS: %1$s is the subscriber name, %2$s is the list, %3$s is the lister's name.
             $act->content = sprintf(_m('%1$s stopped following the list %2$s by %3$s.'),
                                     $sub->getBestName(),
                                     $oprofile->getBestName(),
@@ -1284,8 +1284,8 @@ class OStatusPlugin extends Plugin
                                         array('nickname' => $profileUser->nickname));
                 $output->element('a', array('href' => $url,
                                             'class' => 'entity_remote_tag'),
-                                  // TRANS: Link text for a user to tag an OStatus user.
-                                 _m('Tag'));
+                                  // TRANS: Link text for a user to list an OStatus user.
+                                 _m('List'));
                 $output->elementEnd('li');
             }
         }

diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php
index cba5ff57fc984777911b1373eb5e63013a45512a..dc3922896c1ede19c88b3298693784afa143fba9 100644 (file)
--- a/plugins/OStatus/actions/ostatusinit.php
+++ b/plugins/OStatus/actions/ostatusinit.php
@@ -104,7 +104,7 @@ class OStatusInitAction extends Action
             // 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.
+            // TRANS: Form legend. %1$s is a list, %2$s is a lister'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');

diff --git a/plugins/OStatus/actions/ostatustag.php b/plugins/OStatus/actions/ostatustag.php
index 1df74d9079a8c0650fc81f5e7c48d7351d1d82f1..b94dec12ebffa14e0cd0d20e943d2939356aaeca 100644 (file)
--- a/plugins/OStatus/actions/ostatustag.php
+++ b/plugins/OStatus/actions/ostatustag.php
@@ -36,8 +36,8 @@ class OStatusTagAction extends OStatusInitAction
         parent::prepare($args);
 
         if (common_logged_in()) {
-            // TRANS: Client error displayed when trying to tag a local object as if it is remote.
-            $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,9 +51,9 @@ class OStatusTagAction extends OStatusInitAction
 
     function showContent()
     {
-        // TRANS: Header for tagging a remote object. %s is a remote object's name.
-        $header = sprintf(_m('Tag %s'), $this->nickname);
-        // TRANS: Button text to tag a remote object.
+        // 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',
@@ -68,7 +68,7 @@ class OStatusTagAction extends OStatusInitAction
         // TRANS: Field label.
         $this->input('nickname', _m('User nickname'), $this->nickname,
                      // TRANS: Field title.
-                     _m('Nickname of the user you want to tag.'));
+                     _m('Nickname of the user you want to list.'));
         $this->elementEnd('li');
         $this->elementStart('li', array('id' => 'ostatus_profile'));
         // TRANS: Field label.

diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php
index 483de9e50737d0551d68d08599150084055eee20..bc91b31559247922cb5a309db1fb3d1c96ff43ff 100644 (file)
--- a/plugins/OStatus/actions/usersalmon.php
+++ b/plugins/OStatus/actions/usersalmon.php
@@ -201,12 +201,12 @@ class UsersalmonAction extends SalmonAction
 
             if (empty($tagged)) {
                 // TRANS: Client exception.
-                throw new ClientException(_m('Unidentified profile being tagged.'));
+                throw new ClientException(_m('Unidentified profile being listed.'));
             }
 
             if ($tagged->id !== $this->user->id) {
                 // TRANS: Client exception.
-                throw new ClientException(_m('This user is not the one being tagged.'));
+                throw new ClientException(_m('This user is not the one being listed.'));
             }
 
             // save the list
@@ -217,7 +217,7 @@ class UsersalmonAction extends SalmonAction
             $result = Profile_tag::setTag($ptag->tagger, $tagged->id, $ptag->tag);
             if (!$result) {
                 // TRANS: Client exception.
-                throw new ClientException(_m('The tag could not be saved.'));
+                throw new ClientException(_m('The listing could not be saved.'));
             }
         }
     }
@@ -235,12 +235,12 @@ class UsersalmonAction extends SalmonAction
 
             if (empty($tagged)) {
                 // TRANS: Client exception.
-                throw new ClientException(_m('Unidentified profile being untagged.'));
+                throw new ClientException(_m('Unidentified profile being unlisted.'));
             }
 
             if ($tagged->id !== $this->user->id) {
                 // TRANS: Client exception.
-                throw new ClientException(_m('This user is not the one being untagged.'));
+                throw new ClientException(_m('This user is not the one being unlisted.'));
             }
 
             // save the list
@@ -252,7 +252,7 @@ class UsersalmonAction extends SalmonAction
 
             if (!$result) {
                 // TRANS: Client exception.
-                throw new ClientException(_m('The tag could not be deleted.'));
+                throw new ClientException(_m('The listing could not be deleted.'));
             }
         }
     }

diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index 327dd791e304cd1aa4a83b789d1221b86e70be81..7cb4ac2fce3d7684c95763bcfeea31571d97ae7a 100644 (file)
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -181,13 +181,13 @@ class SalmonAction extends Action
     function handleTag()
     {
         // TRANS: Client exception.
-        throw new ClientException(_m('This target does not understand tag events.'));
+        throw new ClientException(_m('This target does not understand list events.'));
     }
 
     function handleUntag()
     {
         // TRANS: Client exception.
-        throw new ClientException(_m('This target does not understand untag events.'));
+        throw new ClientException(_m('This target does not understand unlist events.'));
     }
 
     /**