Harmonize message for 'User has no profile.' and update translator documentation.

diff --git a/actions/apiaccountupdateprofile.php b/actions/apiaccountupdateprofile.php
index a572131f180434bae0153c290c64ab782725b5be..15b13c0f20b3c62cda9e6fb298eefb1f3816df53 100644 (file)
--- a/actions/apiaccountupdateprofile.php
+++ b/actions/apiaccountupdateprofile.php
@@ -107,7 +107,7 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction
         $profile = $this->user->getProfile();
 
         if (empty($profile)) {
-            // TRANS: Client error displayed if a user profile could not be found.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->clientError(_('User has no profile.'));
             return;
         }

diff --git a/actions/apiaccountupdateprofilebackgroundimage.php b/actions/apiaccountupdateprofilebackgroundimage.php
index 36eaa6c4111ecd1edf1cdcf4232d89477e39f994..bb0cef52a47ae56b753b091ba2e8260c370eae0f 100644 (file)
--- a/actions/apiaccountupdateprofilebackgroundimage.php
+++ b/actions/apiaccountupdateprofilebackgroundimage.php
@@ -195,7 +195,7 @@ class ApiAccountUpdateProfileBackgroundImageAction extends ApiAuthAction
         $profile = $this->user->getProfile();
 
         if (empty($profile)) {
-            // TRANS: Client error displayed when a user has no profile.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->clientError(_('User has no profile.'));
             return;
         }

diff --git a/actions/apiaccountupdateprofilecolors.php b/actions/apiaccountupdateprofilecolors.php
index 621b05b0d906a1f0d21398936f14fc5c7afc6f18..4fa85c68770f9bcf67b51e0da4ed213137e2aedf 100644 (file)
--- a/actions/apiaccountupdateprofilecolors.php
+++ b/actions/apiaccountupdateprofilecolors.php
@@ -179,7 +179,7 @@ class ApiAccountUpdateProfileColorsAction extends ApiAuthAction
         $profile = $this->user->getProfile();
 
         if (empty($profile)) {
-            // TRANS: Client error displayed a user has no profile updating profile colours.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->clientError(_('User has no profile.'));
             return;
         }

diff --git a/actions/apiaccountupdateprofileimage.php b/actions/apiaccountupdateprofileimage.php
index 986a8f3f1eed69c5c11d46dec84112b1e29458cb..3bf064ea891a90737dd260c2875f6bfe8ffc766f 100644 (file)
--- a/actions/apiaccountupdateprofileimage.php
+++ b/actions/apiaccountupdateprofileimage.php
@@ -127,7 +127,7 @@ class ApiAccountUpdateProfileImageAction extends ApiAuthAction
         $profile = $this->user->getProfile();
 
         if (empty($profile)) {
-            // TRANS: Client error displayed if a user profile could not be found updating a profile image.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->clientError(_('User has no profile.'));
             return;
         }

diff --git a/actions/apiuserprofileimage.php b/actions/apiuserprofileimage.php
index d2cf9a3e579fe21cd20df074ab5eace3fb87ccef..2d26e5c4eaaf3eeae52dd7bdb3d499d04cb7bbc1 100644 (file)
--- a/actions/apiuserprofileimage.php
+++ b/actions/apiuserprofileimage.php
@@ -84,7 +84,7 @@ class ApiUserProfileImageAction extends ApiPrivateAuthAction
         $profile = $this->user->getProfile();
 
         if (empty($profile)) {
-            // TRANS: Client error displayed when requesting user information for a user without a profile.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->clientError(_('User has no profile.'));
             return;
         }

diff --git a/actions/apiusershow.php b/actions/apiusershow.php
index ab1bfb9c9c7b7e7fa9d95f4242acd865f820ca07..11638954db2a54ba9836245000ef5b68a9a0bd2a 100644 (file)
--- a/actions/apiusershow.php
+++ b/actions/apiusershow.php
@@ -104,7 +104,7 @@ class ApiUserShowAction extends ApiPrivateAuthAction
         $profile = $this->user->getProfile();
 
         if (empty($profile)) {
-            // TRANS: Client error displayed when requesting user information for a user without a profile.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->clientError(_('User has no profile.'));
             return;
         }

diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index fa97a86ebf69b98127791ddf7a42731e8c7c4264..a581d5ae35ab16595e0236b86356ffad7339e9b0 100644 (file)
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -81,7 +81,7 @@ class AvatarbynicknameAction extends Action
         }
         $profile = $user->getProfile();
         if (!$profile) {
-            // TRANS: Client error displayed trying to get an avatar for a user without a profile.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->clientError(_('User has no profile.'));
             return;
         }

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index ceab14a962aec18ab0138a57c50c634ea173917f..9ac7115e938df994dd7574c6317b4804bd5d060e 100644 (file)
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -104,8 +104,8 @@ class AvatarsettingsAction extends SettingsAction
 
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
-            // TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
-            $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;
         }
 
@@ -190,8 +190,8 @@ class AvatarsettingsAction extends SettingsAction
 
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
-            // TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
-            $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;
         }
 

diff --git a/actions/foaf.php b/actions/foaf.php
index ceb575c7368353e18b9a1c21e2a04936a9be68db..fa6efde6e478bbd9a385cb3b12856302d920a6be 100644 (file)
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -65,7 +65,7 @@ class FoafAction extends Action
         $this->profile = $this->user->getProfile();
 
         if (!$this->profile) {
-            // TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'), 500);
             return false;
         }

diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index db0d40ff0c1036049bac9d6d66f5970bbdc3be48..a6694cd837c929327da53689ea267058a8ccca92 100644 (file)
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -180,8 +180,8 @@ class GrouplogoAction extends GroupDesignAction
 
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
-            // TRANS: Server error displayed coming across a request from a user without a profile.
-            $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;
         }
 

diff --git a/actions/hcard.php b/actions/hcard.php
index 8781f6f882e64514f75da759131fb2d399f815b9..6db2972b9dcf40a727f94bc45bc20091bcd4d031 100644 (file)
--- a/actions/hcard.php
+++ b/actions/hcard.php
@@ -71,7 +71,7 @@ class HcardAction extends Action
         $this->profile = $this->user->getProfile();
 
         if (!$this->profile) {
-            // TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
             return false;
         }

diff --git a/actions/peopletagsbyuser.php b/actions/peopletagsbyuser.php
index 62c956ff931e5a0ef6bef9172bb55f5a971355ec..d348585c900354e365e3b970e40d8d135257ca09 100644 (file)
--- a/actions/peopletagsbyuser.php
+++ b/actions/peopletagsbyuser.php
@@ -101,7 +101,7 @@ class PeopletagsbyuserAction extends OwnerDesignAction
         $this->tagger = $this->user->getProfile();
 
         if (!$this->tagger) {
-            // TRANS: Server error displayed when a user has no profile.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
             return false;
         }

diff --git a/actions/peopletagsforuser.php b/actions/peopletagsforuser.php
index 6496bb0906fc0457d27a107ed4f67b0944a7398b..9883bd3657dc8170a9f6b1910917711629acb9cc 100644 (file)
--- a/actions/peopletagsforuser.php
+++ b/actions/peopletagsforuser.php
@@ -83,7 +83,7 @@ class PeopletagsforuserAction extends OwnerDesignAction
         $this->tagged = $this->user->getProfile();
 
         if (!$this->tagged) {
-            // TRANS: Server error displayed when a user has no profile.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
             return false;
         }

diff --git a/actions/peopletagsubscriptions.php b/actions/peopletagsubscriptions.php
index c4213537036d771ebf2e18ce8d8a94a7b19d6963..b65542e074b846b3cca331cbff9153b940a6dbe4 100644 (file)
--- a/actions/peopletagsubscriptions.php
+++ b/actions/peopletagsubscriptions.php
@@ -85,7 +85,7 @@ class PeopletagsubscriptionsAction extends OwnerDesignAction
         $this->profile = $user->getProfile();
 
         if (!$this->profile) {
-            // TRANS: Server error displayed when a user has no profile.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
             return false;
         }

diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 5514b9a98c31637688d13de6be4c76ef889a1133..16945122f49b51648e02b76fa392f7e31239a2bc 100644 (file)
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -205,8 +205,8 @@ class RemotesubscribeAction extends Action
         $profile = $user->getProfile();
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
-            // TRANS: Server error displayed on page for remote subscribe when user does not have a matching profile.
-            $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;
         }
 

diff --git a/actions/replies.php b/actions/replies.php
index 54109b7b9f40f731f7e428d8ff1960353248a36a..7ae2d0eb766c18d8aa1a130062539c1640c87917 100644 (file)
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -76,7 +76,7 @@ class RepliesAction extends OwnerDesignAction
         $profile = $this->user->getProfile();
 
         if (!$profile) {
-            // TRANS: Server error displayed when trying to reply to a user without a profile.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
             return false;
         }

diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index fd01cd7c02ee28bf32c16a717820cb672c6d65b0..0cb55715f9ec940f737fb4fe63ff634f32f93074 100644 (file)
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -71,9 +71,8 @@ class UserauthorizationAction extends Action
             $profile = $user->getProfile();
             if (!$profile) {
                 common_log_db_error($user, 'SELECT', __FILE__);
-                // TRANS: Server error displayed when trying to authorise a remote subscription request
-                // TRANS: while the user has no profile.
-                $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;
             }
 

diff --git a/actions/usergroups.php b/actions/usergroups.php
index ca95abddf5e69942a04fd791a2767801af8d6a19..178a3586fdea7d473d77caf229039182992b1d32 100644 (file)
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -99,7 +99,7 @@ class UsergroupsAction extends ProfileAction
         $this->profile = $this->user->getProfile();
 
         if (!$this->profile) {
-            // TRANS: Server error displayed requesting groups for a user without a profile.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
             return false;
         }

diff --git a/actions/userrss.php b/actions/userrss.php
index b60cc5e0c7100982f0f37f518fccecf29777d513..85ea2fd7fa4213722084a5eb904abf29a2225025 100644 (file)
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -106,8 +106,8 @@ class UserrssAction extends Rss10Action
         $profile = $user->getProfile();
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
-            // TRANS: Server error displayed in user RSS when user does not have a matching profile.
-            $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);

diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index bd7da195fa0b66f7d72840e28d70ef3741f1b594..51bb9e3e1a17d17e2af83c2eda6ccea0f6f38cef 100644 (file)
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -65,7 +65,7 @@ class GalleryAction extends ProfileAction
         $this->profile = $this->user->getProfile();
 
         if (!$this->profile) {
-            // TRANS: Server error displayed when trying to perform a gallery action with a user without a profile.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
             return false;
         }

diff --git a/lib/profileaction.php b/lib/profileaction.php
index bdd7f9144dda3b887c83de0e44e0ab2821dc1614..09ebcc5de088736384dc0f432e71be15da7a056d 100644 (file)
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -81,7 +81,7 @@ class ProfileAction extends OwnerDesignAction
         $this->profile = $this->user->getProfile();
 
         if (!$this->profile) {
-            // TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
             return false;
         }

diff --git a/plugins/LogFilter/LogFilterPlugin.php b/plugins/LogFilter/LogFilterPlugin.php
index e2153e959c8f6d3b4c0331bd691679afdc4f2969..4f3a45dcdcc661ed41b3838c740f25dc28478f3e 100644 (file)
--- a/plugins/LogFilter/LogFilterPlugin.php
+++ b/plugins/LogFilter/LogFilterPlugin.php
@@ -46,6 +46,7 @@ class LogFilterPlugin extends Plugin
                             'author' => 'Brion Vibber',
                             'homepage' => 'http://status.net/wiki/Plugin:LogFilter',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Provides server-side setting to filter log output by type or keyword.'));
 
         return true;

diff --git a/plugins/Mapstraction/map.php b/plugins/Mapstraction/map.php
index dbba4edd0cbd7a11c904c60e4ba307d1bf4f5e3b..2ccf1642d746fe4cb1a6b89de354e5395eab6461 100644 (file)
--- a/plugins/Mapstraction/map.php
+++ b/plugins/Mapstraction/map.php
@@ -69,6 +69,7 @@ class MapAction extends OwnerDesignAction
         $this->user = User::staticGet('nickname', $nickname);
 
         if (!$this->user) {
+            // TRANS: Client error displayed when referring to a non-existing user.
             $this->clientError(_m('No such user.'), 404);
             return false;
         }
@@ -76,6 +77,7 @@ class MapAction extends OwnerDesignAction
         $this->profile = $this->user->getProfile();
 
         if (!$this->profile) {
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_m('User has no profile.'));
             return false;
         }

diff --git a/plugins/ModPlus/remoteprofileaction.php b/plugins/ModPlus/remoteprofileaction.php
index 4822fc42486ef50bed71c99e59926bd22db09c15..4399c4813c61f5181c054172adad8c6b4f3ce502 100644 (file)
--- a/plugins/ModPlus/remoteprofileaction.php
+++ b/plugins/ModPlus/remoteprofileaction.php
@@ -15,6 +15,7 @@ class RemoteProfileAction extends ShowstreamAction
         $this->profile = Profile::staticGet('id', $id);
 
         if (!$this->profile) {
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_m('User has no profile.'));
             return false;
         }