Merge branch '1.0.x' into emailregistration

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');

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.'));
         }
     }

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);
         }

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;
         }
 

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;
         }
 

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.