Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline...

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

diff --git a/actions/newmessage.php b/actions/newmessage.php
index 8a03aebfac4aa13c2ff1a38babe481b1006dbe74..fa1922c4a0a5fe3a7e13ba6ee536cee9f6d2a04b 100644 (file)
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -85,7 +85,7 @@ class NewmessageAction extends Action
         parent::handle($args);
 
         if (!common_logged_in()) {
-            // TRANS: Client error displayed trying to create a new direct message while not logged in.
+            // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_('Not logged in.'), 403);
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->saveNewMessage();
@@ -137,6 +137,7 @@ class NewmessageAction extends Action
 
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->showForm(_('There was a problem with your session token. ' .
                 'Try again, please.'));
             return;
@@ -174,7 +175,7 @@ class NewmessageAction extends Action
             return;
         } else if ($user->id == $this->other->id) {
             // TRANS: Client error displayed trying to send a direct message to self.
-            $this->clientError(_('Don\'t send a message to yourself; ' .
+            $this->clientError(_('Do not send a message to yourself; ' .
                 'just say it to yourself quietly instead.'), 403);
             return;
         }