diff --git a/actions/editpeopletag.php b/actions/editpeopletag.php
index db34e485cc..92ef50a9f9 100644
--- a/actions/editpeopletag.php
+++ b/actions/editpeopletag.php
@@ -47,12 +47,12 @@ class EditpeopletagAction extends OwnerDesignAction
     function title()
     {
         if ($_SERVER['REQUEST_METHOD'] == 'POST' && $this->boolean('delete')) {
-            // TRANS: Title for edit people tag page after deleting a tag.
-            // TRANS: %s is a tag.
+            // TRANS: Title for edit list page after deleting a tag.
+            // TRANS: %s is a list.
             return sprintf(_('Delete %s list'), $this->peopletag->tag);
         }
-        // TRANS: Title for edit people tag page.
-        // TRANS: %s is a tag.
+        // TRANS: Title for edit list page.
+        // TRANS: %s is a list.
         return sprintf(_('Edit list %s'), $this->peopletag->tag);
     }
 
@@ -105,7 +105,7 @@ class EditpeopletagAction extends OwnerDesignAction
         }
 
         if (!$this->peopletag) {
-            // TRANS: Client error displayed when referring to a non-exsting people tag.
+            // TRANS: Client error displayed when referring to a non-exsting list.
             $this->clientError(_('No such list.'), 404);
             return false;
         }
@@ -215,7 +215,7 @@ class EditpeopletagAction extends OwnerDesignAction
             $this->element('p', 'instructions', $this->confirm);
         } else {
             $this->element('p', 'instructions',
-                           // TRANS: Form instruction for edit people tag form.
+                           // TRANS: Form instruction for edit list form.
                            _('Use this form to edit the list.'));
         }
     }
@@ -293,7 +293,7 @@ class EditpeopletagAction extends OwnerDesignAction
 
         if (!$result) {
             common_log_db_error($this->group, 'UPDATE', __FILE__);
-            // TRANS: TRANS: Server error displayed when updating a people tag fails.
+            // TRANS: TRANS: Server error displayed when updating a list fails.
             $this->serverError(_('Could not update list.'));
         }
 
diff --git a/actions/peopletagged.php b/actions/peopletagged.php
index 7ab16b6f87..ea25c8675b 100644
--- a/actions/peopletagged.php
+++ b/actions/peopletagged.php
@@ -92,7 +92,7 @@ class PeopletaggedAction extends OwnerDesignAction
         $this->peopletag = Profile_list::pkeyGet(array('tagger' => $user->id, 'tag' => $tag));
 
         if (!$this->peopletag) {
-            // TRANS: Client error displayed when referring to non-existing people tag.
+            // TRANS: Client error displayed when referring to a non-existing list.
             $this->clientError(_('No such list.'), 404);
             return false;
         }
@@ -103,13 +103,13 @@ class PeopletaggedAction extends OwnerDesignAction
     function title()
     {
         if ($this->page == 1) {
-            // TRANS: Title for list of people tagged by the user with a tag.
-            // TRANS: %1$s is a tag, %2$s is a username.
+            // TRANS: Title for list of people listed by the user.
+            // TRANS: %1$s is a list, %2$s is a username.
             return sprintf(_('People listed in %1$s by %2$s'),
                            $this->peopletag->tag, $this->tagger->nickname);
         } else {
-            // TRANS: Title for list of people tagged by the user with a tag.
-            // TRANS: %1$s is a tag, %2$s is a username, %2$s is a page number.
+            // TRANS: Title for list of people listed by the user.
+            // TRANS: %1$s is a list, %2$s is a username, %2$s is a page number.
             return sprintf(_('People listed in %1$s by %2$s, page %3$d'),
                            $this->peopletag->tag, $this->user->nickname,
                            $this->page);
diff --git a/actions/peopletagsforuser.php b/actions/peopletagsforuser.php
index 7f5c216070..0dd71d242c 100644
--- a/actions/peopletagsforuser.php
+++ b/actions/peopletagsforuser.php
@@ -102,7 +102,7 @@ class PeopletagsforuserAction extends OwnerDesignAction
     function showAnonymousMessage()
     {
         $notice =
-          // TRANS: Message displayed for anonymous users on page that displays people tags for a user.
+          // TRANS: Message displayed for anonymous users on page that displays lists for a user.
           // TRANS: This message contains Markdown links in the form [description](links).
           // TRANS: %s is a tagger nickname.
           sprintf(_('These are lists for **%s**. ' .
@@ -138,7 +138,7 @@ class PeopletagsforuserAction extends OwnerDesignAction
 
     function showEmptyListMessage()
     {
-        // TRANS: Message displayed on page that displays people tags for a user when there are none.
+        // TRANS: Message displayed on page that displays lists for a user when there are none.
         // TRANS: This message contains Markdown links in the form [description](links).
         // TRANS: %s is a tagger nickname.
         $message = sprintf(_('%s has not been [listed](%%%%doc.lists%%%%) by anyone yet.'), $this->tagged->nickname);
diff --git a/actions/peopletagsubscriptions.php b/actions/peopletagsubscriptions.php
index 3674cc1e76..c421353703 100644
--- a/actions/peopletagsubscriptions.php
+++ b/actions/peopletagsubscriptions.php
@@ -46,11 +46,11 @@ class PeopletagsubscriptionsAction extends OwnerDesignAction
     function title()
     {
         if ($this->page == 1) {
-            // TRANS: Title for page that displays people tags subscribed to by a user.
+            // TRANS: Title for page that displays lists subscribed to by a user.
             // TRANS: %s is a profile nickname.
             return sprintf(_('Lists subscribed to by %s'), $this->profile->nickname);
         } else {
-            // TRANS: Title for page that displays people tags subscribed to by a user.
+            // TRANS: Title for page that displays lists subscribed to by a user.
             // TRANS: %1$s is a profile nickname, %2$d is a page number.
             return sprintf(_('Lists subscribed to by %1$s, page %2$d'), $this->profile->nickname, $this->page);
         }
@@ -104,7 +104,7 @@ class PeopletagsubscriptionsAction extends OwnerDesignAction
     function showAnonymousMessage()
     {
         $notice =
-          // TRANS: Message displayed for anonymous users on page that displays people tags subscribed to by a user.
+          // TRANS: Message displayed for anonymous users on page that displays lists subscribed to by a user.
           // TRANS: This message contains Markdown links in the form [description](links).
           // TRANS: %s is a profile nickname.
           sprintf(_('These are lists subscribed to by **%s**. ' .
diff --git a/actions/register.php b/actions/register.php
index f4ad38ef7c..47ac062713 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -606,7 +606,6 @@ class RegisterAction extends Action
     function showSuccessContent()
     {
         if (Event::handle('onStartRegisterSuccess', array($this))) {
-
             $nickname = $this->arg('nickname');
 
             $profileurl = common_local_url('showstream',
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 9fc4656ac2..b4575565b9 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -227,8 +227,8 @@ class SubscriptionsListItem extends SubscriptionListItem
             }
 
             $this->out->element('input', $attrs);
-            // TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-            $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _('IM'));
+            // TRANS: Checkbox label for enabling IM messages for a profile in a subscriptions list.
+            $this->out->element('label', array('for' => 'jabber-'.$this->profile->id), _m('LABEL','IM'));
         } else {
             $this->out->hidden('jabber', $sub->jabber);
         }