? .cvsignore
? text_changes.patch
Index: privatemsg.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/privatemsg.module,v
retrieving revision 1.143
diff -u -p -r1.143 privatemsg.module
--- privatemsg.module	24 Jul 2010 20:21:05 -0000	1.143
+++ privatemsg.module	27 Jul 2010 08:27:29 -0000
@@ -1521,10 +1521,10 @@ function _privatemsg_validate_message(&$
   // Check again, give another error message if all recipients are blocked
   if (empty($message['recipients'])) {
     if ($form) {
-      form_set_error('to', t('Disallowed to send message because all recipients are blocked'));
+      form_set_error('to', t('This message cannot be sent because all recipients are blocked.'));
     }
     else {
-      $messages['error'][] = t('Disallowed to send message because all recipients are blocked');
+      $messages['error'][] = t('This message cannot be sent because all recipients are blocked.');
     }
   }
 
Index: privatemsg.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/privatemsg.test,v
retrieving revision 1.21
diff -u -p -r1.21 privatemsg.test
--- privatemsg.test	17 Jul 2010 10:34:43 -0000	1.21
+++ privatemsg.test	27 Jul 2010 08:27:29 -0000
@@ -411,7 +411,7 @@ class PrivatemsgTestCase extends DrupalW
     );
     $this->drupalLogin($enableduser);
     $this->drupalPost('messages/new', $message, t('Send message'));
-    $this->assertText(t('Disallowed to send message because all recipients are blocked'), 'Message was not sent.');
+    $this->assertText(t('This message cannot be sent because all recipients are blocked.'));
 
     // Make sure that a message to multiple recipients still works if one is
     // disabled.
Index: pm_block_user/pm_block_user.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/pm_block_user/pm_block_user.module,v
retrieving revision 1.8
diff -u -p -r1.8 pm_block_user.module
--- pm_block_user/pm_block_user.module	6 Jul 2010 18:03:07 -0000	1.8
+++ pm_block_user/pm_block_user.module	27 Jul 2010 08:27:29 -0000
@@ -179,7 +179,7 @@ function pm_block_user_privatemsg_block_
     if (_pm_block_user_rule_exists($author, $recipients[$id], PM_BLOCK_USER_DISALLOW_SENDING)) {
       $blocked[] = array(
         'recipient' => $id,
-        'message' => t('Sorry, private messaging rules forbid sending messages to !name.', array('!name' => $recipients[$id]->name)),
+        'message' => t('You are not permitted to send messages to [username].', array('!name' => $recipients[$id]->name)),
       );
     }
   }
@@ -211,7 +211,7 @@ function pm_block_user_privatemsg_block_
     }
     $blocked[] = array(
       'recipient' => privatemsg_recipient_key($recipient),
-      'message' => t('%name has chosen to not recieve any more messages from you.', array('%name' => $recipient->name))
+      'message' => t('%name has chosen to block messages from you.', array('%name' => $recipient->name))
     );
   }
   return $blocked;
Index: pm_block_user/pm_block_user.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/pm_block_user/pm_block_user.test,v
retrieving revision 1.4
diff -u -p -r1.4 pm_block_user.test
--- pm_block_user/pm_block_user.test	6 Jul 2010 18:03:07 -0000	1.4
+++ pm_block_user/pm_block_user.test	27 Jul 2010 08:27:29 -0000
@@ -94,8 +94,8 @@ class PrivatemsgBlockUserCase extends Dr
       'body'    => $this->randomName(50),
     );
     $this->drupalPost('messages/new', $edit, t('Send message'));
-    $this->assertRaw(t('%user has chosen to not recieve any more messages from you.', array('%user' => $user1->name)), t('User 1 blocks user 2 message displayed'));
-    $this->assertText(t('Disallowed to send message because all recipients are blocked'), t('Disallowed to send message displayed'));
+    $this->assertRaw(t('%user has chosen to block messages from you.', array('%user' => $user1->name)), t('User 1 blocks user 2 message displayed'));
+    $this->assertText(t('This message cannot be sent because all recipients are blocked.'));
 
     $edit = array(
       'recipient' => $user1->name . ', ' . $user3->name,
@@ -103,7 +103,7 @@ class PrivatemsgBlockUserCase extends Dr
       'body'    => $this->randomName(50),
     );
     $this->drupalPost('messages/new', $edit, t('Send message'));
-    $this->assertRaw(t('%user has chosen to not recieve any more messages from you.', array('%user' => $user1->name)), t('User 1 blocks user 2 message displayed'));
+    $this->assertRaw(t('%user has chosen to block messages from you.', array('%user' => $user1->name)), t('User 1 blocks user 2 message displayed'));
     $this->assertText(t('A message has been sent to @user.', array('@user' => $user3->name)), t('Message sent to user 3'));