Complete "people tag" to "list" in UI messages.

Update translator documentation accordingly.

Probably a few cases left where "tag[ged[" has to be replaced by "list[ed]".

diff --git a/actions/addpeopletag.php b/actions/addpeopletag.php
index a1260efbd33cb372085e0ffb49123c83fa7f23c2..c3e312d99cffb5ee7a533fdcf1327773f7ff24f8 100644 (file)
--- a/actions/addpeopletag.php
+++ b/actions/addpeopletag.php
@@ -106,8 +106,8 @@ class AddpeopletagAction extends Action
         $this->peopletag = Profile_list::staticGet('id', $id);
 
         if (empty($this->peopletag)) {
-            // TRANS: Client error displayed trying to reference a non-existing people tag.
-            $this->clientError(_('No such people tag.'));
+            // TRANS: Client error displayed trying to reference a non-existing list.
+            $this->clientError(_('No such list.'));
             return false;
         }
 
@@ -161,7 +161,7 @@ class AddpeopletagAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            // TRANS: Title after subscribing to a people tag.
+            // TRANS: Title after subscribing to a list.
             $this->element('title', null, _('Subscribed'));
             $this->elementEnd('head');
             $this->elementStart('body');

diff --git a/actions/editpeopletag.php b/actions/editpeopletag.php
index 3a66458c9eb739d91177db3b1bf4639500f51440..115049f7abf6a48289932aec7ea65a8cff5490df 100644 (file)
--- a/actions/editpeopletag.php
+++ b/actions/editpeopletag.php
@@ -260,7 +260,7 @@ class EditpeopletagAction extends OwnerDesignAction
             return;
         } else if (Profile_list::descriptionTooLong($description)) {
             $this->showForm(sprintf(
-                    // TRANS: Client error shown when providing too long a description when editing a people tag.
+                    // TRANS: Client error shown when providing too long a description when editing a list.
                     // TRANS: %d is the maximum number of allowed characters.
                     _m('Description is too long (maximum %d character).',
                       'Description is too long (maximum %d characters).',
@@ -318,7 +318,7 @@ class EditpeopletagAction extends OwnerDesignAction
                                                    'tag'    => $tag)),
                             303);
         } else {
-            // TRANS: Edit people tag form success message.
+            // TRANS: Edit list form success message.
             $this->showForm(_('Options saved.'));
         }
     }

diff --git a/actions/peopletagsubscribers.php b/actions/peopletagsubscribers.php
index 5cdccfa15bafee877324cf57699fca9b0f9e9ac6..ebc3a9f494e5b40838fbd75b5c5779dc2d801839 100644 (file)
--- a/actions/peopletagsubscribers.php
+++ b/actions/peopletagsubscribers.php
@@ -92,8 +92,8 @@ class PeopletagsubscribersAction extends OwnerDesignAction
         $this->peopletag = Profile_list::pkeyGet(array('tagger' => $user->id, 'tag' => $tag));
 
         if (!$this->peopletag) {
-            // TRANS: Client error displayed trying to reference a non-existing people tag.
-            $this->clientError(_('No such people tag.'), 404);
+            // TRANS: Client error displayed trying to reference a non-existing list.
+            $this->clientError(_('No such list.'), 404);
             return false;
         }
 
@@ -103,14 +103,14 @@ class PeopletagsubscribersAction extends OwnerDesignAction
     function title()
     {
         if ($this->page == 1) {
-            // TRANS: Page title for list of people tag subscribers.
-            // TRANS: %1$s is a tag, %2$s is a user nickname.
-            return sprintf(_('Subscribers of people tagged %1$s by %2$s'),
+            // TRANS: Page title for list of list subscribers.
+            // TRANS: %1$s is a list, %2$s is a user nickname.
+            return sprintf(_('Subscribers to list %1$s by %2$s'),
                            $this->peopletag->tag, $this->tagger->nickname);
         } else {
-            // TRANS: Page title for list of people tag subscribers.
-            // TRANS: %1$s is a tag, %2$s is a user nickname, %3$d is a page number.
-            return sprintf(_('Subscribers of people tagged %1$s by %2$s, page %3$d'),
+            // TRANS: Page title for list of list subscribers.
+            // TRANS: %1$s is a list, %2$s is a user nickname, %3$d is a page number.
+            return sprintf(_('Subscribers to list %1$s by %2$s, page %3$d'),
                            $this->peopletag->tag, $this->tagger->nickname,
                            $this->page);
         }

diff --git a/actions/profilecompletion.php b/actions/profilecompletion.php
index 00831b2a224eeeec8eb85975776f6040b24464c8..045bf68a7fcbf2a01ae669af5c0bc1cdc7e2ad79 100644 (file)
--- a/actions/profilecompletion.php
+++ b/actions/profilecompletion.php
@@ -97,8 +97,8 @@ class ProfilecompletionAction extends Action
         $this->peopletag = Profile_list::staticGet('id', $id);
 
         if (empty($this->peopletag)) {
-            // TRANS: Client error displayed trying to reference a non-existing people tag.
-            $this->clientError(_('No such people tag.'));
+            // TRANS: Client error displayed trying to reference a non-existing list.
+            $this->clientError(_('No such list.'));
             return false;
         }
 

diff --git a/actions/profiletagbyid.php b/actions/profiletagbyid.php
index 3a70f54add13e6fd43154cb85452f7e19674a0dc..396e634abae6fa49d8c7e093c76fd1ac4b270439 100644 (file)
--- a/actions/profiletagbyid.php
+++ b/actions/profiletagbyid.php
@@ -63,8 +63,8 @@ class ProfiletagbyidAction extends Action
         $this->peopletag = Profile_list::staticGet('id', $id);
 
         if (!$this->peopletag) {
-            // TRANS: Client error displayed trying to reference a non-existing people tag.
-            $this->clientError(_('No such people tag.'), 404);
+            // TRANS: Client error displayed trying to reference a non-existing list.
+            $this->clientError(_('No such list.'), 404);
             return false;
         }
 

diff --git a/actions/publicpeopletagcloud.php b/actions/publicpeopletagcloud.php
index e8023bc9791b8efac2d381962f1b3e92ce59fce6..cb65bbb163a4a44a3ca023b7177c6d0f1618c5f5 100644 (file)
--- a/actions/publicpeopletagcloud.php
+++ b/actions/publicpeopletagcloud.php
@@ -53,33 +53,33 @@ class PublicpeopletagcloudAction extends Action
 
     function title()
     {
-        // TRANS: Title for page with public people tag cloud.
-        return _('Public people tag cloud');
+        // TRANS: Title for page with public list cloud.
+        return _('Public list cloud');
     }
 
     function showPageNotice()
     {
         $this->element('p', 'instructions',
-                       // TRANS: Page notice for page with public people tag cloud.
+                       // TRANS: Page notice for page with public list cloud.
                        // TRANS: %s is a StatusNet sitename.
-                       sprintf(_('These are most used people tags on %s'),
+                       sprintf(_('These are largest lists on %s'),
                                common_config('site', 'name')));
     }
 
     function showEmptyList()
     {
-        // TRANS: Empty list message on page with public people tag cloud.
+        // TRANS: Empty list message on page with public list cloud.
         // TRANS: This message contains Markdown links in the form [description](link).
-        $message = _('No one has [tagged](%%doc.tags%%) anyone yet.') . ' ';
+        $message = _('No one has [listed](%%doc.tags%%) anyone yet.') . ' ';
 
         if (common_logged_in()) {
-            // TRANS: Additional empty list message on page with public people tag cloud for logged in users.
-            $message .= _('Be the first to tag someone!');
+            // TRANS: Additional empty list message on page with public list cloud for logged in users.
+            $message .= _('Be the first to list someone!');
         }
         else {
-            // TRANS: Additional empty list message on page with public people tag cloud for anonymous users.
+            // TRANS: Additional empty list message on page with public list cloud for anonymous users.
         // TRANS: This message contains Markdown links in the form [description](link).
-            $message .= _('Why not [register an account](%%action.register%%) and be the first to tag someone!');
+            $message .= _('Why not [register an account](%%action.register%%) and be the first to list someone!');
         }
 
         $this->elementStart('div', 'guide');
@@ -132,8 +132,8 @@ class PublicpeopletagcloudAction extends Action
             ksort($tw);
 
             $this->elementStart('dl');
-            // TRANS: DT element on on page with public people tag cloud.
-            $this->element('dt', null, _('People tag cloud'));
+            // TRANS: DT element on on page with public list cloud.
+            $this->element('dt', null, _('List cloud'));
             $this->elementStart('dd');
             $this->elementStart('ul', 'tags xoxo tag-cloud');
             foreach ($tw as $tag => $weight) {
@@ -173,8 +173,8 @@ class PublicpeopletagcloudAction extends Action
 
         $this->elementStart('li', $rel);
 
-        // TRANS: Link title for number of people tagged. %d is the number of people tagged.
-        $title = sprintf(_m('1 person tagged','%d people tagged',$weight),$weight);
+        // TRANS: Link title for number of listed people. %d is the number of listed people.
+        $title = sprintf(_m('1 person listed','%d people listed',$weight),$weight);
         $this->element('a', array('href'  => common_local_url('peopletag', array('tag' => $tag)),
                                   'title' => $title), $tag);
         $this->elementEnd('li');

diff --git a/actions/removepeopletag.php b/actions/removepeopletag.php
index 2d9bd836c7973b058c1815e876e1687e01c4b80a..207b6747a2c1cf38bd0751dd3a4928c6667a0129 100644 (file)
--- a/actions/removepeopletag.php
+++ b/actions/removepeopletag.php
@@ -107,8 +107,8 @@ class RemovepeopletagAction extends Action
         $this->peopletag = Profile_list::staticGet('id', $id);
 
         if (empty($this->peopletag)) {
-            // TRANS: Client error displayed trying to reference a non-existing people tag.
-            $this->clientError(_('No such people tag.'));
+            // TRANS: Client error displayed trying to reference a non-existing list.
+            $this->clientError(_('No such list.'));
             return false;
         }
 
@@ -147,14 +147,14 @@ class RemovepeopletagAction extends Action
             $user = User::staticGet('id', $this->tagged->id);
             if ($user) {
                 $this->clientError(
-                        // TRANS: Client error displayed when an unknown error occurs while tagging a user.
+                        // TRANS: Client error displayed when an unknown error occurs while listing a user.
                         // TRANS: %s is a username.
-                        sprintf(_('There was an unexpected error while tagging %s.'),
+                        sprintf(_('There was an unexpected error while listing %s.'),
                         $user->nickname));
             } else {
-                // TRANS: Client error displayed when an unknown error occurs while tagging a user.
+                // TRANS: Client error displayed when an unknown error occurs while listing a user.
                 // TRANS: %s is a profile URL.
-                $this->clientError(sprintf(_('There was a problem tagging %s. ' .
+                $this->clientError(sprintf(_('There was a problem listing %s. ' .
                                       'The remote server is probably not responding correctly, ' .
                                       'please try retrying later.'), $this->profile->profileurl));
             }
@@ -163,7 +163,7 @@ class RemovepeopletagAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            // TRANS: Title after untagging a people tag.
+            // TRANS: Title after removing a user from a list.
             $this->element('title', null, _('Untagged'));
             $this->elementEnd('head');
             $this->elementStart('body');

diff --git a/actions/selftag.php b/actions/selftag.php
index c9ac3a2010d9e7bd944e864ac8b994f438dc1bed..b886c3d9f731cc28e4e041df35c3e40159eb5365 100644 (file)
--- a/actions/selftag.php
+++ b/actions/selftag.php
@@ -63,9 +63,9 @@ class SelftagAction extends Action
         $this->tag = $this->trimmed('tag');
 
         if (!common_valid_profile_tag($this->tag)) {
-            // TRANS: Client error displayed when trying to tag a profile with an invalid tag.
-            // TRANS: %s is the invalid tag.
-            $this->clientError(sprintf(_('Not a valid people tag: %s.'),
+            // TRANS: Client error displayed when trying to list a profile with an invalid list.
+            // TRANS: %s is the invalid list name.
+            $this->clientError(sprintf(_('Not a valid list: %s.'),
                 $this->tag));
             return;
         }

diff --git a/actions/showprofiletag.php b/actions/showprofiletag.php
index a25e2339794644cb81b8d8242cfd258c190f243e..d1b0768d232aebf95dbf9a06896cf5b41a3dc6d7 100644 (file)
--- a/actions/showprofiletag.php
+++ b/actions/showprofiletag.php
@@ -307,7 +307,7 @@ class ShowprofiletagAction extends Action
                                                                      array('nickname' => $this->tagger->nickname,
                                                                            'profiletag' => $this->peopletag->tag)),
                                           'class' => 'more'),
-                               // TRANS: Link for more "People tagged x by a user"
+                               // TRANS: Link for more "People in list x by a user"
                                // TRANS: if there are more than the mini list's maximum.
                                _('Show all'));
                 $this->elementEnd('p');

diff --git a/actions/subscribepeopletag.php b/actions/subscribepeopletag.php
index b0484835b777f66178437dcc8acd2372d2edf8ad..dee0384c5d04040004887ab948ec5d1067e7667d 100644 (file)
--- a/actions/subscribepeopletag.php
+++ b/actions/subscribepeopletag.php
@@ -56,7 +56,7 @@ class SubscribepeopletagAction extends Action
 
         if (!common_logged_in()) {
             // TRANS: Client error displayed when trying to perform an action while not logged in.
-            $this->clientError(_('You must be logged in to unsubscribe to a people tag.'));
+            $this->clientError(_('You must be logged in to unsubscribe from a list.'));
             return false;
         }
         // Only allow POST requests
@@ -91,8 +91,8 @@ class SubscribepeopletagAction extends Action
         }
 
         if (!$this->peopletag || $this->peopletag->private) {
-            // TRANS: Client error displayed trying to reference a non-existing people tag.
-            $this->clientError(_('No such people tag.'), 404);
+            // TRANS: Client error displayed trying to reference a non-existing list.
+            $this->clientError(_('No such list.'), 404);
             return false;
         }
 
@@ -120,18 +120,18 @@ class SubscribepeopletagAction extends Action
         try {
             Profile_tag_subscription::add($this->peopletag, $cur);
         } catch (Exception $e) {
-            // TRANS: Server error displayed subscribing to a people tag fails.
-            // TRANS: %1$s is a user nickname, %2$s is a people tag.
-            $this->serverError(sprintf(_('Could not subscribe user %1$s to people tag %2$s.'),
-                                       $cur->nickname, $this->peopletag->tag) . ' ' . $e->getMessage());
+            // TRANS: Server error displayed subscribing to a list fails.
+            // TRANS: %1$s is a user nickname, %2$s is a list, %3$s is the error message (no period).
+            $this->serverError(sprintf(_('Could not subscribe user %1$s to list %2$s: %3$s'),
+                                       $cur->nickname, $this->peopletag->tag), $e->getMessage());
         }
 
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            // TRANS: Title of form to subscribe to a people tag.
-            // TRANS: %1%s is a user nickname, %2$s is a people tag, %3$s is a tagger nickname.
-            $this->element('title', null, sprintf(_('%1$s subscribed to people tag %2$s by %3$s'),
+            // TRANS: Title of form to subscribe to a list.
+            // TRANS: %1%s is a user nickname, %2$s is a list, %3$s is a tagger nickname.
+            $this->element('title', null, sprintf(_('%1$s subscribed to list %2$s by %3$s'),
                                                   $cur->nickname,
                                                   $this->peopletag->tag,
                                                   $this->tagger->nickname));

diff --git a/actions/tagprofile.php b/actions/tagprofile.php
index e79a80aca803396892c905da38304f04ae929381..4305f4bc885f45643b13941d4fb79b1463601a2c 100644 (file)
--- a/actions/tagprofile.php
+++ b/actions/tagprofile.php
@@ -74,12 +74,12 @@ class TagprofileAction extends Action
     function title()
     {
         if (!$this->profile) {
-            // TRANS: Title for people tag form when not on a profile page.
-            return _('Tag a profile');
+            // TRANS: Title for list form when not on a profile page.
+            return _('List a profile');
         }
-        // TRANS: Title for people tag form when on a profile page.
+        // TRANS: Title for list form when on a profile page.
         // TRANS: %s is a profile nickname.
-        return sprintf(_('Tag %s'), $this->profile->nickname);
+        return sprintf(_m('ADDTOLIST','List %s'), $this->profile->nickname);
     }
 
     function showForm($error=null)
@@ -88,7 +88,7 @@ class TagprofileAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            // TRANS: Title for people tag form when an error has occurred.
+            // TRANS: Title for list form when an error has occurred.
             $this->element('title', null, _m('TITLE','Error'));
             $this->elementEnd('head');
             $this->elementStart('body');
@@ -104,7 +104,7 @@ class TagprofileAction extends Action
     {
         if (Event::handle('StartShowTagProfileForm', array($this, $this->profile)) && $this->profile) {
             $this->elementStart('div', 'entity_profile vcard author');
-            // TRANS: Header in people tag form.
+            // TRANS: Header in list form.
             $this->element('h2', null, _('User profile'));
 
             $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
@@ -147,8 +147,8 @@ class TagprofileAction extends Action
                                                'action' => common_local_url('tagprofile', array('id' => $this->profile->id))));
 
             $this->elementStart('fieldset');
-            // TRANS: Fieldset legend for people tag form.
-            $this->element('legend', null, _('Tag user'));
+            // TRANS: Fieldset legend for list form.
+            $this->element('legend', null, _('List user'));
             $this->hidden('token', common_session_token());
             $this->hidden('id', $this->profile->id);
 
@@ -158,14 +158,14 @@ class TagprofileAction extends Action
             $this->elementStart('li');
 
             $tags = Profile_tag::getTagsArray($user->id, $this->profile->id, $user->id);
-            // TRANS: Field label on people tag form.
-            $this->input('tags', _m('LABEL','Tags'),
+            // TRANS: Field label on list form.
+            $this->input('tags', _m('LABEL','Lists'),
                          ($this->arg('tags')) ? $this->arg('tags') : implode(' ', $tags),
-                         // TRANS: Field title on people tag form.
-                         _('Tags for this user (letters, numbers, -, ., and _), comma- or space- separated.'));
+                         // TRANS: Field title on list form.
+                         _('Lists for this user (letters, numbers, -, ., and _), comma- or space- separated.'));
             $this->elementEnd('li');
             $this->elementEnd('ul');
-            // TRANS: Button text to save people tags.
+            // TRANS: Button text to save lists.
             $this->submit('save', _m('BUTTON','Save'));
             $this->elementEnd('fieldset');
             $this->elementEnd('form');
@@ -240,8 +240,8 @@ class TagprofileAction extends Action
                 $this->elementEnd('body');
                 $this->elementEnd('html');
             } else {
-                // TRANS: Success message if people tags are saved.
-                $this->error = _('Tags saved.');
+                // TRANS: Success message if lists are saved.
+                $this->error = _('Lists saved.');
                 $this->showForm();
             }
 
@@ -257,7 +257,7 @@ class TagprofileAction extends Action
             $this->elementStart('div', 'instructions');
             $this->element('p', null,
                            // TRANS: Page notice.
-                           _('Use this form to add tags to your subscribers or subscriptions.'));
+                           _('Use this form to add your subscribers or subscriptions to lists.'));
             $this->elementEnd('div');
         }
     }

diff --git a/actions/unsubscribepeopletag.php b/actions/unsubscribepeopletag.php
index 94434109119981ca395f84fb8bc610af7e445a76..bb53766cc1d6bafcb96ec2d99d028cd573f7b9ad 100644 (file)
--- a/actions/unsubscribepeopletag.php
+++ b/actions/unsubscribepeopletag.php
@@ -57,7 +57,7 @@ class UnsubscribepeopletagAction extends Action
 
         if (!common_logged_in()) {
             // TRANS: Client error displayed when trying to perform an action while not logged in.
-            $this->clientError(_('You must be logged in to unsubscribe to a people tag.'));
+            $this->clientError(_('You must be logged in to unsubscribe from a list.'));
             return false;
         }
         // Only allow POST requests
@@ -92,8 +92,8 @@ class UnsubscribepeopletagAction extends Action
         }
 
         if (!$this->peopletag || $this->peopletag->private) {
-            // TRANS: Client error displayed trying to reference a non-existing people tag.
-            $this->clientError(_('No such people tag.'), 404);
+            // TRANS: Client error displayed trying to reference a non-existing list.
+            $this->clientError(_('No such list.'), 404);
             return false;
         }
 
@@ -122,9 +122,9 @@ class UnsubscribepeopletagAction extends Action
         if ($this->boolean('ajax')) {
             $this->startHTML('text/xml;charset=utf-8');
             $this->elementStart('head');
-            // TRANS: Page title for form that allows unsubscribing from a people tag.
-            // TRANS: %1$s is a nickname, %2$s is a people tag, %3$s is a tagger nickname.
-            $this->element('title', null, sprintf(_('%1$s unsubscribed to people tag %2$s by %3$s'),
+            // TRANS: Page title for form that allows unsubscribing from a list.
+            // TRANS: %1$s is a nickname, %2$s is a list, %3$s is a tagger nickname.
+            $this->element('title', null, sprintf(_('%1$s unsubscribed from list %2$s by %3$s'),
                                                   $cur->nickname,
                                                   $this->peopletag->tag,
                                                   $this->tagger->nickname));

diff --git a/classes/Profile_tag.php b/classes/Profile_tag.php
index 00585280d3153146e885c6a10b9eae5ba8a0ad5a..9e475e83ec16e9db00dc58d02336157e41e61da6 100644 (file)
--- a/classes/Profile_tag.php
+++ b/classes/Profile_tag.php
@@ -167,10 +167,10 @@ class Profile_tag extends Memcached_DataObject
             $profile_list = Profile_list::ensureTag($tagger, $tag, $desc, $private);
 
             if ($profile_list->taggedCount() >= common_config('peopletag', 'maxpeople')) {
-                // TRANS: Client exception thrown trying to set one tag for more people than allowed.
-                throw new ClientException(sprintf(_('You already have %1$d or more people tagged %2$s, ' .
+                // TRANS: Client exception thrown when trying to add more people than allowed to a list.
+                throw new ClientException(sprintf(_('You already have %1$d or more people in list %2$s, ' .
                                                     'which is the maximum allowed number.' .
-                                                    'Try untagging others with the same tag first.'),
+                                                    'Try unlisting others first.'),
                                                     common_config('peopletag', 'maxpeople'), $tag));
                 return false;
             }

diff --git a/classes/Profile_tag_subscription.php b/classes/Profile_tag_subscription.php
index c8b136da60583073f661eac8e4a5946bb4e4156a..031405f531983c5b30ea2a43c2db51d93a6faddf 100644 (file)
--- a/classes/Profile_tag_subscription.php
+++ b/classes/Profile_tag_subscription.php
@@ -50,8 +50,8 @@ class Profile_tag_subscription extends Memcached_DataObject
 
             if (!$result) {
                 common_log_db_error($sub, 'INSERT', __FILE__);
-                // TRANS: Exception thrown when inserting a people tag subscription in the database fails.
-                throw new Exception(_('Adding people tag subscription failed.'));
+                // TRANS: Exception thrown when inserting a list subscription in the database fails.
+                throw new Exception(_('Adding list subscription failed.'));
             }
 
             $ptag = Profile_list::staticGet('id', $peopletag->id);
@@ -77,8 +77,8 @@ class Profile_tag_subscription extends Memcached_DataObject
 
             if (!$result) {
                 common_log_db_error($sub, 'DELETE', __FILE__);
-                // TRANS: Exception thrown when deleting a people tag subscription from the database fails.
-                throw new Exception(_('Removing people tag subscription failed.'));
+                // TRANS: Exception thrown when deleting a list subscription from the database fails.
+                throw new Exception(_('Removing list subscription failed.'));
             }
 
             $peopletag->subscriberCount(true);

diff --git a/lib/atomlistnoticefeed.php b/lib/atomlistnoticefeed.php
index 55ad9d228c584c02d213ae948b85fa6842242fa5..ee4f01cad403604ecff866b4ebea9eb707b0e08d 100644 (file)
--- a/lib/atomlistnoticefeed.php
+++ b/lib/atomlistnoticefeed.php
@@ -62,14 +62,14 @@ class AtomListNoticeFeed extends AtomNoticeFeed
         $this->tagger = Profile::staticGet('id', $list->tagger);
 
         // TRANS: Title in atom list notice feed. %1$s is a list name, %2$s is a tagger's nickname.
-        $title = sprintf(_('Timeline for people tagged #%1$s by %2$s'), $list->tag, $this->tagger->nickname);
+        $title = sprintf(_('Timeline for people in list %1$s by %2$s'), $list->tag, $this->tagger->nickname);
         $this->setTitle($title);
 
         $sitename   = common_config('site', 'name');
         $subtitle   = sprintf(
             // TRANS: Message is used as a subtitle in atom list notice feed.
             // TRANS: %1$s is a tagger's nickname, %2$s is a list name, %3$s is a site name.
-            _('Updates from %1$s\'s %2$s people tag on %3$s!'),
+            _('Updates from %1$s\'s list %2$s on %3$s!'),
             $this->tagger->nickname,
             $list->tag,
             $sitename

diff --git a/lib/peopletageditform.php b/lib/peopletageditform.php
index c9bbd576f890e39296e3b9442904ea622361c00c..3dd8dafeddd579f0df38fc593ea0873347dc0ea9 100644 (file)
--- a/lib/peopletageditform.php
+++ b/lib/peopletageditform.php
@@ -127,11 +127,11 @@ class PeopletagEditForm extends Form
         $this->out->elementStart('li');
         $this->out->hidden('id', $id);
 
-        // TRANS: Field label for people tag.
-        $this->out->input('tag', _m('LABEL','Tag'),
+        // TRANS: Field label for list.
+        $this->out->input('tag', _m('LABEL','List'),
                           ($this->out->arg('tag')) ? $this->out->arg('tag') : $tag,
-                          // TRANS: Field title for people tag.
-                          _('Change the tag (letters, numbers, -, ., and _ are allowed).'));
+                          // TRANS: Field title for list.
+                          _('Change the list (letters, numbers, -, ., and _ are allowed).'));
         $this->out->elementEnd('li');
 
         $this->out->elementStart('li');
@@ -164,7 +164,7 @@ class PeopletagEditForm extends Form
      */
     function formActions()
     {
-        // TRANS: Button text to save a people tag.
+        // TRANS: Button text to save a list.
         $this->out->submit('submit', _('Save'));
         $this->out->submit('form_action-yes',
                       // TRANS: Button text to delete a list.
@@ -178,11 +178,11 @@ class PeopletagEditForm extends Form
     function showProfileList()
     {
         $tagged = $this->peopletag->getTagged();
-        // TRANS: Header in people tag edit form.
+        // TRANS: Header in list edit form.
         $this->out->element('h2', null, _('Add or remove people'));
 
         $this->out->elementStart('div', 'profile_search_wrap');
-        // TRANS: Header in people tag edit form.
+        // TRANS: Header in list edit form.
         $this->out->element('h3', null, _m('HEADER','Search'));
         $search = new SearchProfileForm($this->out, $this->peopletag);
         $search->show();

diff --git a/lib/peopletaggroupnav.php b/lib/peopletaggroupnav.php
index c247bdb8d843bcdafecf970e6280858f0123f329..3cfcb3cff37a47b6cb86d57d515f3c9e68b81389 100644 (file)
--- a/lib/peopletaggroupnav.php
+++ b/lib/peopletaggroupnav.php
@@ -138,7 +138,7 @@ class PeopletagGroupNav extends Widget
                 // Edit
                 $this->out->menuItem(common_local_url('editpeopletag', array('tagger' => $user->nickname,
                                                                              'tag'    => $tag->tag)),
-                                 // TRANS: Menu item in people tag navigation panel.
+                                 // TRANS: Menu item in list navigation panel.
                                  _m('MENU','Edit'),
                                  // TRANS: Menu item title in list navigation panel.
                                  // TRANS: %s is a list.

diff --git a/lib/peopletaglist.php b/lib/peopletaglist.php
index a776f07d5c501586ef5420e30488627b152ba6ec..3ee1d349383c8689ad47afb7aad46a7cd04d609d 100644 (file)
--- a/lib/peopletaglist.php
+++ b/lib/peopletaglist.php
@@ -256,7 +256,7 @@ class PeopletagListItem extends Widget
             $this->out->elementStart('a',
                 array('href' => common_local_url('peopletagsbyuser',
                     array('nickname' => $this->profile->nickname, 'private' => 1))));
-            // TRANS: Privacy mode text in people tag list item for private tags.
+            // TRANS: Privacy mode text in list list item for private list.
             $this->out->element('span', 'privacy_mode', _m('MODE','Private'));
             $this->out->elementEnd('a');
         }

diff --git a/lib/peopletagnoticestream.php b/lib/peopletagnoticestream.php
index f90255b111c195dc654c307226373a87bbf3f340..9477ca8ea6dfc5f0cf52d06131c2461f01866d3b 100644 (file)
--- a/lib/peopletagnoticestream.php
+++ b/lib/peopletagnoticestream.php
@@ -3,7 +3,7 @@
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2011, StatusNet, Inc.
  *
- * Stream of notices for a people tag
+ * Stream of notices for a list
  *
  * PHP version 5
  *
@@ -35,7 +35,7 @@ if (!defined('STATUSNET')) {
 }
 
 /**
- * Stream of notices for a people tag
+ * Stream of notices for a list
  *
  * @category  Stream
  * @package   StatusNet
@@ -59,7 +59,7 @@ class PeopletagNoticeStream extends ScopingNoticeStream
 }
 
 /**
- * Stream of notices for a people tag
+ * Stream of notices for a list
  *
  * @category  Stream
  * @package   StatusNet

diff --git a/lib/peopletags.php b/lib/peopletags.php
index ec8c04241df75d47631975282cb4c8014bbefdfb..40f07c06b72e77ecd89cf4d6625f6e2893fb926e 100644 (file)
--- a/lib/peopletags.php
+++ b/lib/peopletags.php
@@ -83,8 +83,8 @@ class PeopletagsWidget extends Widget
 
     function label()
     {
-        // TRANS: Label in people tags widget.
-        return _m('LABEL','Tags by you');
+        // TRANS: Label in lists widget.
+        return _m('LABEL','Your lists');
     }
 
     function showTags()
@@ -131,8 +131,8 @@ class PeopletagsWidget extends Widget
                                            'action' => common_local_url('tagprofile', array('id' => $this->tagged->id))));
 
         $this->out->elementStart('fieldset');
-        // TRANS: Fieldset legend in people tags widget.
-        $this->out->element('legend', null, _m('LEGEND','Edit tags'));
+        // TRANS: Fieldset legend in lists widget.
+        $this->out->element('legend', null, _m('LEGEND','Edit lists'));
         $this->out->hidden('token', common_session_token());
         $this->out->hidden('id', $this->tagged->id);
 

diff --git a/lib/peopletagsforusersection.php b/lib/peopletagsforusersection.php
index e5cd3316c559a7140c9aac137aba2c795b48a208..37f46b850d128c5b83d4430b5a775c86c154c27b 100644 (file)
--- a/lib/peopletagsforusersection.php
+++ b/lib/peopletagsforusersection.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * People tags a user has been tagged with
+ * Lists a user is in
  *
  * PHP version 5
  *
@@ -31,7 +31,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 }
 
 /**
- * People tags a user has been tagged with
+ * List a user has is in
  *
  * @category Widget
  * @package  StatusNet

diff --git a/lib/subscribepeopletagform.php b/lib/subscribepeopletagform.php
index 4cc3a8e90bce30e066ca674d8be0c28b20be99bf..c570ff1cee7a8ac5ec67106da428ef6de8c5a38b 100644 (file)
--- a/lib/subscribepeopletagform.php
+++ b/lib/subscribepeopletagform.php
@@ -102,7 +102,7 @@ class SubscribePeopletagForm extends Form
      */
     function formActions()
     {
-        // TRANS: Button text for subscribing to a people tag.
+        // TRANS: Button text for subscribing to a list.
         $this->out->submit('submit', _m('BUTTON', 'Subscribe'));
 
     }

diff --git a/lib/togglepeopletag.php b/lib/togglepeopletag.php
index bc9d136fe5c2ce4585754336812b19fd3309f5d0..156ce30af5fbfeb3592c40894a412943f0224c07 100644 (file)
--- a/lib/togglepeopletag.php
+++ b/lib/togglepeopletag.php
@@ -186,8 +186,8 @@ class UntagButton extends Form
     function formLegend()
     {
         // TRANS: Form legend.
-        // TRANS: %1$s is a nickname, $2$s is a people tag.
-        $this->out->element('legend', null, sprintf(_('Untag %1$s as %2$s'),
+        // TRANS: %1$s is a nickname, $2$s is a list.
+        $this->out->element('legend', null, sprintf(_('Remove %1$s from list %2$s'),
             $this->profile->nickname, $this->peopletag->tag));
     }
 
@@ -263,9 +263,9 @@ class TagButton extends Form
      */
     function formLegend()
     {
-        // TRANS: Legend on form to add a tag to a profile.
-        // TRANS: %1$s is a nickname, %2$s ia a people tag.
-        $this->out->element('legend', null, sprintf(_('Tag %1$s as %2$s'),
+        // TRANS: Legend on form to add a profile to a list.
+        // TRANS: %1$s is a nickname, %2$s is a list.
+        $this->out->element('legend', null, sprintf(_('Add %1$s to list %2$s'),
             $this->profile->nickname, $this->peopletag->tag));
     }
 

diff --git a/lib/unsubscribepeopletagform.php b/lib/unsubscribepeopletagform.php
index 62343567f4b582a9ec32f971214af2f609b1dfff..dac90af77e333975bdf253c5871e73ab54dd15e8 100644 (file)
--- a/lib/unsubscribepeopletagform.php
+++ b/lib/unsubscribepeopletagform.php
@@ -102,7 +102,7 @@ class UnsubscribePeopletagForm extends Form
      */
     function formActions()
     {
-        // TRANS: Button text for unsubscribing from a people tag.
+        // TRANS: Button text for unsubscribing from a list.
         $this->out->submit('submit', _m('BUTTON','Unsubscribe'));
     }
 }

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index fe1db3b81f2d5c470346470d36342fd411b815a3..e807fbc7ba570862dc9d0a8a4970650b8adc8603 100644 (file)
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -885,8 +885,8 @@ class OStatusPlugin extends Plugin
                 return true;
             } else {
                 $oprofile->garbageCollect();
-                // TRANS: Exception thrown when subscription of remote people tag fails.
-                throw new Exception(_m('Failed subscribing to remote people tag.'));
+                // TRANS: Exception thrown when subscription to remote list fails.
+                throw new Exception(_m('Failed subscribing to remote list.'));
             }
         }
     }
@@ -922,7 +922,7 @@ class OStatusPlugin extends Plugin
             $act->object = $oprofile->asActivityObject();
 
             $act->time = time();
-            $act->title = _m('Unfollow people tag');
+            $act->title = _m('Unfollow list');
             $act->content = sprintf(_m('%1$s stopped following the list %2$s by %3$s.'),
                                     $sub->getBestName(),
                                     $oprofile->getBestName(),

diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php
index 8dc68e4b0185bd0eaaa5f5cadfad38d3e27e5cde..ed886ada1bee8051be7c5eab063f46de66447425 100644 (file)
--- a/plugins/OStatus/actions/ostatusinit.php
+++ b/plugins/OStatus/actions/ostatusinit.php
@@ -104,9 +104,9 @@ 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 people tag, %2$s is a tagger's name.
-            $header = sprintf(_m('Subscribe to people tagged %1$s by %2$s'), $this->peopletag, $this->tagger);
-            // TRANS: Button text to subscribe to a people tag.
+            // 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 {
@@ -167,7 +167,7 @@ class OStatusInitAction extends Action
             $this->connectWebfinger($this->profile);
         } else {
             // TRANS: Client error.
-            $this->clientError(_m("Must provide a remote profile."));
+            $this->clientError(_m('Must provide a remote profile.'));
         }
     }
 
@@ -218,7 +218,7 @@ class OStatusInitAction extends Action
                 return common_local_url('userbyid', array('id' => $user->id));
             } else {
                 // TRANS: Client error.
-                $this->clientError("No such user.");
+                $this->clientError(_m('No such user.'));
             }
         } else if ($this->group) {
             $group = Local_group::staticGet('nickname', $this->group);
@@ -226,12 +226,12 @@ class OStatusInitAction extends Action
                 return common_local_url('groupbyid', array('id' => $group->group_id));
             } else {
                 // TRANS: Client error.
-                $this->clientError("No such group.");
+                $this->clientError(_m('No such group.'));
             }
         } else if ($this->peopletag && $this->tagger) {
             $user = User::staticGet('nickname', $this->tagger);
             if (empty($user)) {
-                $this->clientError("No such user.");
+                $this->clientError(_m('No such user.'));
             }
 
             $peopletag = Profile_list::getByTaggerAndTag($user->id, $this->peopletag);
@@ -239,10 +239,10 @@ class OStatusInitAction extends Action
                 return common_local_url('profiletagbyid',
                     array('tagger_id' => $user->id, 'id' => $peopletag->id));
             }
-            $this->clientError("No such people tag.");
+            $this->clientError(_m('No such list.'));
         } else {
             // TRANS: Client error.
-            $this->clientError("No local user or group nickname provided.");
+            $this->clientError(_m('No local user or group nickname provided.'));
         }
     }
 

diff --git a/plugins/OStatus/actions/ostatuspeopletag.php b/plugins/OStatus/actions/ostatuspeopletag.php
index d4f64553cffdddfffda6b4f505f546832383688b..014b6cabbd44b51ebe2501c8338cbfee8b43438c 100644 (file)
--- a/plugins/OStatus/actions/ostatuspeopletag.php
+++ b/plugins/OStatus/actions/ostatuspeopletag.php
@@ -70,9 +70,9 @@ class OStatusPeopletagAction extends OStatusSubAction
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->input('profile',
-                     _m('Subscribe to people tag'),
+                     _m('Subscribe to list'),
                      $this->profile_uri,
-                     _m("Address of the OStatus people tag, like http://example.net/user/all/tag"));
+                     _m("Address of the OStatus list, like http://example.net/user/all/tag"));
         $this->elementEnd('li');
         $this->elementEnd('ul');
 
@@ -95,7 +95,7 @@ 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.'));
+                           _m('You are already subscribed to this list.'));
             $ok = false;
         } else {
             $ok = true;
@@ -157,8 +157,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');
     }
 
     /**

diff --git a/plugins/OStatus/actions/ostatustag.php b/plugins/OStatus/actions/ostatustag.php
index eaf9c167e7a98f3a26fdb20392f3b1b738f8b47f..cde1d67562459e276902a39311b6001075a13693 100644 (file)
--- a/plugins/OStatus/actions/ostatustag.php
+++ b/plugins/OStatus/actions/ostatustag.php
@@ -112,6 +112,6 @@ class OStatusTagAction extends OStatusInitAction
 
     function title()
     {
-      return _m('OStatus people tag');  
+      return _m('OStatus list');  
     }
 }

diff --git a/plugins/OStatus/actions/pushhub.php b/plugins/OStatus/actions/pushhub.php
index b2a97dbc6c9366547159f3ecd8f952a22a5723f1..e9dca7ab9d8181d3cb232288015430abd0852826 100644 (file)
--- a/plugins/OStatus/actions/pushhub.php
+++ b/plugins/OStatus/actions/pushhub.php
@@ -183,7 +183,7 @@ class PushHubAction extends Action
                 $user = User::staticGet('id', $user);
                 if (!$list || !$user || $list->tagger != $user->id) {
                     // TRANS: Client exception. %s is a feed URL.
-                    throw new ClientException(sprintf(_m('Invalid hub.topic %s; people tag does not exist.'),$feed));
+                    throw new ClientException(sprintf(_m('Invalid hub.topic %s; list does not exist.'),$feed));
                 } else {
                     return true;
                 }

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 83a6d73f948d20dda3bde6df908fc0bb97fc13b4..329228d8c9be099908b49e5f1c55a1e006cc24fd 100644 (file)
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -1209,7 +1209,7 @@ class Ostatus_profile extends Managed_DataObject
         if ($object->link && common_valid_http_url($object->link)) {
             return $object->link;
         }
-        throw new ServerException("No author ID URI found.");
+        throw new ServerException(_m('No author ID URI found.'));
     }
 
     /**
@@ -1234,7 +1234,7 @@ class Ostatus_profile extends Managed_DataObject
 
         if (!$homeuri) {
             common_log(LOG_DEBUG, __METHOD__ . " empty actor profile URI: " . var_export($activity, true));
-            throw new Exception('No profile URI.');
+            throw new Exception(_m('No profile URI.'));
         }
 
         $user = User::staticGet('uri', $homeuri);
@@ -1252,7 +1252,7 @@ class Ostatus_profile extends Managed_DataObject
         if ($ptag) {
             $local_user = User::staticGet('id', $ptag->tagger);
             if (!empty($local_user)) {
-                throw new Exception('Local people tag cannot be referenced as remote.');
+                throw new Exception(_m('Local list cannot be referenced as remote.'));
             }
         }
 
@@ -1326,7 +1326,7 @@ class Ostatus_profile extends Managed_DataObject
 
             $oprofile->peopletag_id = $ptag->insert();
             if (!$oprofile->peopletag_id) {
-                throw new ServerException('Cannot save local people tag.');
+                throw new ServerException(_m('Cannot save local list.'));
             }
         }
 
@@ -1772,7 +1772,7 @@ class Ostatus_profile extends Managed_DataObject
             if (!$result) {
                 common_log_db_error($oprofile, 'INSERT', __FILE__);
                 // TRANS: Exception. %s is a webfinger address.
-                throw new Exception(sprintf(_m('Could not save ostatus_profile for "%s".'),$addr));
+                throw new Exception(sprintf(_m('Could not save OStatus profile for "%s".'),$addr));
             }
 
             self::cacheSet(sprintf('ostatus_profile:webfinger:%s', $addr), $oprofile->uri);