Merge branch '1.0.x'

[quix0rs-gnu-social.git] / plugins / UserFlag / adminprofileflag.php

diff --git a/plugins/UserFlag/adminprofileflag.php b/plugins/UserFlag/adminprofileflag.php
index df0450f66a53d6cbd4a80c13d963cee3b3acec94..d9e57cfc4b1a247d3446b733e0f292e1fdf4ccff 100644 (file)
--- a/plugins/UserFlag/adminprofileflag.php
+++ b/plugins/UserFlag/adminprofileflag.php
@@ -61,7 +61,8 @@ class AdminprofileflagAction extends Action
         // User must be logged in.
 
         if (!common_logged_in()) {
-            $this->clientError(_('Not logged in.'));
+            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
+            $this->clientError(_m('Not logged in.'));
             return;
         }
 
@@ -85,7 +86,8 @@ class AdminprofileflagAction extends Action
         // User must have the right to review flags
 
         if (!$user->hasRight(UserFlagPlugin::REVIEWFLAGS)) {
-            $this->clientError(_('You cannot review profile flags.'));
+            // TRANS: Error message displayed when trying to review profile flags while not authorised.
+            $this->clientError(_m('You cannot review profile flags.'));
             return false;
         }
 
@@ -384,7 +386,7 @@ class FlaggedProfileListItem extends ProfileListItem
                 $flagging_users = implode(', ', $lnks);
                 // TRANS: Message displayed on a profile if it has been flagged.
                 // TRANS: %1$s is a comma separated list of at most 5 user nicknames that flagged.
-                // TRANS: %2$d is a positive integer of additional flagging users. Also used for the plural.
+                // TRANS: %2$d is a positive integer of additional flagging users. Also used for plural.
                 $text .= sprintf(_m('Flagged by %1$s and %2$d other', 'Flagged by %1$s and %2$d others', $others), $flagging_users, $others);
             } else {
                 // TRANS: Message displayed on a profile if it has been flagged.