Index: notify.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/notify/notify.module,v
retrieving revision 2.67.2.3
diff -u -r2.67.2.3 notify.module
--- notify.module	15 Jul 2007 03:54:19 -0000	2.67.2.3
+++ notify.module	30 Aug 2008 14:28:29 -0000
@@ -247,10 +247,10 @@
     variable_set('notify_send_last', time());
 
     if ($num_sent > 0) {
-      drupal_set_message(t('@count pending notification e-mails have been sent.', array('@count' => $num_sent)));
+      drupal_set_message(t('!count pending notification e-mails have been sent.', array('!count' => $num_sent)));
     }
     elseif ($num_failed > 0) {
-      drupal_set_message(t('@count notification e-mails could not be sent.', array('@count' => $num_failed)), 'error');
+      drupal_set_message(t('!count notification e-mails could not be sent.', array('!count' => $num_failed)), 'error');
     }
     else {
       drupal_set_message(t('No notification e-mails needed to be sent.'));
@@ -376,8 +376,8 @@
         if ($node_count > 0) {
           $node_body .= $mini_separator ."\n\n";
         }
-        $node_body .= ++$node_count .'. '. t('@title', array('@title' => $node->title)) ."\n";
-        $node_body .= t('@status @type by @author', array('@status' => $status, '@type' => node_get_types('name', $node), '@author' => ($node->name ? $node->name : variable_get('anonymous', 'Anonymous')))) ."\n";
+        $node_body .= ++$node_count .'. '. $node->title ."\n";
+        $node_body .= t('!status !type by !author', array('!status' => $status, '!type' => node_get_types('name', $node), '!author' => ($node->name ? $node->name : variable_get('anonymous', 'Anonymous')))) ."\n";
         $node_body .= '[ '. url('node/'. $node->nid, NULL, NULL, TRUE) ." ]\n\n";
         $node_body .= _notify_content($node, $user) ."\n";
       }
@@ -385,7 +385,7 @@
       // Prepend node e-mail header as long as user could access at least one node.
       if ($node_count > 0) {
         $node_body = $separator ."\n"
-          . t('Recent content - @count', array('@count' => format_plural(count($nodes), '1 new post', '@count new posts'))) ."\n"
+          . t('Recent content - !count', array('!count' => format_plural(count($nodes), '1 new post', '!count new posts'))) ."\n"
           . $separator ."\n\n". $node_body;
       }
     }
@@ -408,11 +408,11 @@
         if ($comment_body) {
           $comment_body .= $mini_separator ."\n\n";
         }
-        $comment_body .= t('@count attached to @type posted by @author: @title', array('@count' => format_plural(count($comment), '1 new comment', '@count new comments'), '@title' => $nodes[$nid]->title, '@type' => node_get_types('name', $nodes[$nid]), '@author' => $nodes[$nid]->name ? $nodes[$nid]->name : variable_get('anonymous', 'Anonymous'))) ."\n";
+        $comment_body .= t('!count attached to !type posted by !author: !title', array('!count' => format_plural(count($comment), '1 new comment', '!count new comments'), '!title' => $nodes[$nid]->title, '!type' => node_get_types('name', $nodes[$nid]), '!author' => $nodes[$nid]->name ? $nodes[$nid]->name : variable_get('anonymous', 'Anonymous'))) ."\n";
 
         $comment_count = 0;
         foreach ($comment as $c) {
-          $comment_body .= '   '. ++$comment_count .'. '. t('@title by @author', array('@title' => $c->subject, '@author' => ($c->name ? $c->name : variable_get(anonymous, 'Anonymous')))) ."\n"
+          $comment_body .= '   '. ++$comment_count .'. '. t('!title by !author', array('!title' => $c->subject, '!author' => ($c->name ? $c->name : variable_get(anonymous, 'Anonymous')))) ."\n"
             .'     '. url('node/'. $nid, NULL, 'comment-'. $c->cid, TRUE) ."\n\n";
           $total_comment_count++;
         }
@@ -420,7 +420,7 @@
 
       if ($total_comment_count > 0) {
         $comment_body = $separator ."\n"
-          . t('Recent comments - @count', array('@count' => format_plural($total_comment_count, '1 new comment', '@count new comments'))) ."\n"
+          . t('Recent comments - !count', array('!count' => format_plural($total_comment_count, '1 new comment', '!count new comments'))) ."\n"
           . $separator ."\n\n". $comment_body;
       }
     }
@@ -432,13 +432,13 @@
       // Set up initial values for e-mail.
       $from = variable_get('site_mail', ini_get('sendmail_from'));
       $from_name = variable_get('site_name', 'Drupal');
-      $subject = t('@sitename new content notification for @username', array('@username' => $user->name, '@sitename' => variable_get('site_name', 'Drupal')));
+      $subject = t('!sitename new content notification for !username', array('!username' => $user->name, '!sitename' => variable_get('site_name', 'Drupal')));
 
-      $body = t('Greetings @user,', array('@user' => $user->name)) ."\n\n". $body;
+      $body = t('Greetings !user,', array('!user' => $user->name)) ."\n\n". $body;
 
       $body .= "\n-- \n";
-      $body .= t('This is an automatic e-mail from @sitename.', array('@sitename' => variable_get('site_name', 'Drupal')))."\n";
-      $body .= t('To stop receiving these e-mails, change your notification preferences at @notify-url', array('@notify-url' => url("user/$user->uid/notify" , NULL, NULL, TRUE)))."\n";
+      $body .= t('This is an automatic e-mail from !sitename.', array('!sitename' => variable_get('site_name', 'Drupal')))."\n";
+      $body .= t('To stop receiving these e-mails, change your notification preferences at !notify-url', array('!notify-url' => url("user/$user->uid/notify" , NULL, NULL, TRUE)))."\n";
 
       $headers = array();//'From' => "$from_name <$from>");
       if (!drupal_mail('notify_mail', $user->mail, $subject, wordwrap($body, 72), $from, $headers)) {