Merged messages interface changes.

git-svn-id: http://code.elgg.org/elgg/trunk@5270 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 85 insertions, 79 deletions

diff --git a/mod/messages/languages/en.php b/mod/messages/languages/en.php
index ab83eedf2..d49d83cc2 100644
--- a/mod/messages/languages/en.php
+++ b/mod/messages/languages/en.php
@@ -1,87 +1,93 @@
 <?php
+/**
+* Elgg send a message action page
+* 
+* @package ElggMessages
+* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+* @author Curverider Ltd <info@elgg.com>
+* @copyright Curverider Ltd 2008-2010
+* @link http://elgg.com/
+*/
 
-	$english = array(
-	
-		/**
-		 * Menu items and titles
-		 */
-	
-			'messages' => "Messages",
-            'messages:back' => "back to messages",
-			'messages:user' => "Your inbox",
-			'messages:sentMessages' => "Sent messages",
-			'messages:posttitle' => "%s's messages: %s",
-			'messages:inbox' => "Inbox",
-			'messages:send' => "Send a message",
-			'messages:sent' => "Sent messages",
-			'messages:message' => "Message",
-			'messages:title' => "Title",
-			'messages:to' => "To",
-            'messages:from' => "From",
-			'messages:fly' => "Send",
-			'messages:replying' => "Message replying to",
-			'messages:inbox' => "Inbox",
-			'messages:sendmessage' => "Send a message",
-			'messages:compose' => "Compose a message",
-			'messages:sentmessages' => "Sent messages",
-			'messages:recent' => "Recent messages",
-            'messages:original' => "Original message",
-            'messages:yours' => "Your message",
-            'messages:answer' => "Reply",
-			'messages:toggle' => 'Toggle all',
-			'messages:markread' => 'Mark read',
-			
-			'messages:new' => 'New message',
-	
-			'notification:method:site' => 'Site',
-	
-			'messages:error' => 'There was a problem saving your message. Please try again.',
-	
-			'item:object:messages' => 'Messages',
-	
-		/**
-		 * Status messages
-		 */
-	
-			'messages:posted' => "Your message was successfully sent.",
-			'messages:deleted' => "Your messages were successfully deleted.",
-			'messages:markedread' => "Your messages were successfully marked as read.",
-	
-		/**
-		 * Email messages
-		 */
-	
-			'messages:email:subject' => 'You have a new message!',
-			'messages:email:body' => "You have a new message from %s. It reads:
-
-			
-%s
-
-
-To view your messages, click here:
+$english = array(
+	/**
+	* Menu items and titles
+	*/
+
+	'messages' => "Messages",
+	'messages:back' => "back to messages",
+	'messages:user' => "Your inbox",
+	'messages:sentMessages' => "Sent messages",
+	'messages:posttitle' => "%s's messages: %s",
+	'messages:inbox' => "Inbox",
+	'messages:send' => "Send a message",
+	'messages:sent' => "Sent messages",
+	'messages:message' => "Message",
+	'messages:title' => "Title",
+	'messages:to' => "To",
+	'messages:from' => "From",
+	'messages:fly' => "Send",
+	'messages:replying' => "Message replying to",
+	'messages:inbox' => "Inbox",
+	'messages:sendmessage' => "Send a message",
+	'messages:compose' => "Compose a message",
+	'messages:sentmessages' => "Sent messages",
+	'messages:recent' => "Recent messages",
+	'messages:original' => "Original message",
+	'messages:yours' => "Your message",
+	'messages:answer' => "Reply",
+	'messages:toggle' => 'Toggle all',
+	'messages:markread' => 'Mark read',
+	'messages:recipient' => 'Choose a recipient&hellip;',
+
+	'messages:new' => 'New message',
+
+	'notification:method:site' => 'Messages',
+
+	'messages:error' => 'There was a problem saving your message. Please try again.',
+
+	'item:object:messages' => 'Messages',
+
+	/**
+	* Status messages
+	*/
+
+	'messages:posted' => "Your message was successfully sent.",
+	'messages:deleted' => "Your messages were successfully deleted.",
+	'messages:markedread' => "Your messages were successfully marked as read.",
+
+	/**
+	* Email messages
+	*/
+
+	'messages:email:subject' => 'You have a new message!',
+	'messages:email:body' => "You have a new message from %s. It reads:
+
+
+	%s
+
+
+	To view your messages, click here:
 
 	%s
 
-To send %s a message, click here:
+	To send %s a message, click here:
 
 	%s
 
-You cannot reply to this email.",
-	
-		/**
-		 * Error messages
-		 */
-	
-			'messages:blank' => "Sorry; you need to actually put something in the message body before we can save it.",
-			'messages:notfound' => "Sorry; we could not find the specified message.",
-			'messages:notdeleted' => "Sorry; we could not delete this message.",
-			'messages:nopermission' => "You do not have permission to alter that message.",
-			'messages:nomessages' => "There are no messages to display.",
-			'messages:user:nonexist' => "We could not find the recipient in the user database.",
-			'messages:user:blank' => "You did not select someone to send this to.",
-	
-	);
-					
-	add_translation("en",$english);
-
-?>
\ No newline at end of file
+	You cannot reply to this email.",
+
+	/**
+	* Error messages
+	*/
+
+	'messages:blank' => "Sorry; you need to actually put something in the message body before we can save it.",
+	'messages:notfound' => "Sorry; we could not find the specified message.",
+	'messages:notdeleted' => "Sorry; we could not delete this message.",
+	'messages:nopermission' => "You do not have permission to alter that message.",
+	'messages:nomessages' => "There are no messages to display.",
+	'messages:user:nonexist' => "We could not find the recipient in the user database.",
+	'messages:user:blank' => "You did not select someone to send this to.",
+);
+		
+add_translation("en", $english);
\ No newline at end of file