Merge activity plugin into mainline

[quix0rs-gnu-social.git] / actions / userrss.php

diff --git a/actions/userrss.php b/actions/userrss.php
index ba9f64f8ac70fee482ba5f0d6fcf9ab0d4434fb2..85ea2fd7fa4213722084a5eb904abf29a2225025 100644 (file)
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -37,6 +37,7 @@ class UserrssAction extends Rss10Action
         $this->tag  = $this->trimmed('tag');
 
         if (!$this->user) {
+            // TRANS: Client error displayed when user not found for an action.
             $this->clientError(_('No such user.'));
             return false;
         } else {
@@ -105,7 +106,8 @@ class UserrssAction extends Rss10Action
         $profile = $user->getProfile();
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
-            $this->serverError(_('User without matching profile.'));
+            // TRANS: Error message displayed when referring to a user without a profile.
+            $this->serverError(_('User has no profile.'));
             return null;
         }
         $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);