Index: mail_edit.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mail_edit/mail_edit.install,v
retrieving revision 1.1.4.4
diff -b -u -p -r1.1.4.4 mail_edit.install
--- mail_edit.install	23 Dec 2008 00:45:39 -0000	1.1.4.4
+++ mail_edit.install	20 Sep 2010 00:08:30 -0000
@@ -22,36 +22,36 @@ function mail_edit_uninstall() {
 function mail_edit_schema() {
   
   $schema['mail_edit'] = array(
-    'description' => t(''),
+    'description' => '',
     'fields' => array(
       'description' => array(
         'type' => 'varchar',
         'length' => '255',
         'not null' => TRUE,
-        'description' => t(''),
+        'description' => '',
       ),
       'subject' => array(
         'type' => 'varchar',
         'length' => '255',
         'not null' => TRUE,
-        'description' => t(''),
+        'description' => '',
       ),
       'id' => array(
         'type' => 'varchar',
         'length' => '255',
         'not null' => TRUE,
-        'description' => t(''),
+        'description' => '',
       ),
       'language' => array(
         'type' => 'varchar',
         'length' => '10',
         'not null' => TRUE,
-        'description' => t(''),
+        'description' => '',
       ),
       'body' => array(
         'type' => 'text',
         'size' => 'normal',
-        'description' => t(''),
+        'description' => '',
       ),
     ),
     'primary key' => array('id', 'language'),
@@ -60,31 +60,31 @@ function mail_edit_schema() {
     ),
   );
   $schema['mail_edit_registry'] = array(
-    'description' => t(''),
+    'description' => '',
     'fields' => array(
       'id' => array(
         'type' => 'varchar',
         'length' => '255',
         'not null' => TRUE,
-        'description' => t(''),
+        'description' => '',
       ),
       'module' => array(
         'type' => 'varchar',
         'length' => '255',
         'not null' => TRUE,
-        'description' => t(''),
+        'description' => '',
       ),
       'mailkey' => array(
         'type' => 'varchar',
         'length' => '255',
         'not null' => TRUE,
-        'description' => t(''),
+        'description' => '',
       ),
       'description' => array(
         'type' => 'varchar',
         'length' => '255',
         'not null' => TRUE,
-        'description' => t(''),
+        'description' => '',
       ),      
     ),
     'primary key' => array('id'),
@@ -112,36 +112,36 @@ function mail_edit_update_6000() {
 
     // Now install the D6 schema as of update_6000:
     $schema['mail_edit'] = array(
-      'description' => t(''),
+      'description' => '',
       'fields' => array(
         'description' => array(
           'type' => 'varchar',
           'length' => '255',
           'not null' => TRUE,
-          'description' => t(''),
+          'description' => '',
         ),
         'subject' => array(
           'type' => 'varchar',
           'length' => '255',
           'not null' => TRUE,
-          'description' => t(''),
+          'description' => '',
         ),
         'id' => array(
           'type' => 'varchar',
           'length' => '255',
           'not null' => TRUE,
-          'description' => t(''),
+          'description' => '',
         ),
         'language' => array(
           'type' => 'varchar',
           'length' => '10',
           'not null' => TRUE,
-          'description' => t(''),
+          'description' => '',
         ),
         'body' => array(
           'type' => 'text',
           'size' => 'normal',
-          'description' => t(''),
+          'description' => '',
         ),
       ),
       'primary key' => array('id', 'language'),
@@ -150,31 +150,31 @@ function mail_edit_update_6000() {
       ),
     );
     $schema['mail_edit_registry'] = array(
-      'description' => t(''),
+      'description' => '',
       'fields' => array(
         'id' => array(
           'type' => 'varchar',
           'length' => '255',
           'not null' => TRUE,
-          'description' => t(''),
+          'description' => '',
         ),
         'module' => array(
           'type' => 'varchar',
           'length' => '255',
           'not null' => TRUE,
-          'description' => t(''),
+          'description' => '',
         ),
         'mailkey' => array(
           'type' => 'varchar',
           'length' => '255',
           'not null' => TRUE,
-          'description' => t(''),
+          'description' => '',
         ),
         'description' => array(
           'type' => 'varchar',
           'length' => '255',
           'not null' => TRUE,
-          'description' => t(''),
+          'description' => '',
         ),      
       ),
       'primary key' => array('id'),
Index: mail_edit.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mail_edit/mail_edit.module,v
retrieving revision 1.4.2.6
diff -b -u -p -r1.4.2.6 mail_edit.module
--- mail_edit.module	8 Jun 2009 10:42:36 -0000	1.4.2.6
+++ mail_edit.module	20 Sep 2010 00:08:30 -0000
@@ -18,15 +18,15 @@ function mail_edit_menu() {
     'access arguments' => array('administer site configuration'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('mail_edit_list_form'),
-    'description' => t('Edit mails being sent out by Drupal.'),
-    'title' => t('Mail templates'),
+    'description' => 'Edit mails being sent out by Drupal.',
+    'title' => 'Mail templates',
   );
   $items['admin/build/mail-edit/%/%'] = array(
     'access arguments' => array('administer site configuration'),
     'page callback' => 'drupal_get_form',
     'page arguments' => array('mail_edit_trans', 3, 4),
-    'description' => t('Edit mails being sent out by Drupal.'),
-    'title' => t('Mail templates'),
+    'description' => 'Edit mails being sent out by Drupal.',
+    'title' => 'Mail templates',
   );
   return $items;
 }
@@ -60,8 +60,12 @@ function mail_edit_trans(&$form_status, 
   }
 //  drupal_set_message('<pre>' . print_r($template, 1) . '</pre>');
 
-  $message = $update? 'Update ':'Create new ';
-  $message.= "{$mailkey} template for {$lang} language";
+  if ($update) {
+    $message = t('Update %mailkey template for %language', array('%mailkey' => $mailkey, '%language' => $lang));
+  }
+  else {
+    $message = t('Create new %mailkey template for %language', array('%mailkey' => $mailkey, '%language' => $lang));
+  }
   drupal_set_title($message);
 
   $tokens = array();
@@ -82,7 +86,7 @@ function mail_edit_trans(&$form_status, 
     '#value'  => $id,
   );
   $form['description'] = array(
-    '#title'      => t('description'),
+    '#title'      => t('Description'),
     '#type'       => 'textfield',
     '#default_value' => isset($template->description) ? $template->description : (isset($mailkey_obj->description) ? filter_xss($mailkey_obj->description, array()) : ''),
   );
@@ -128,7 +132,7 @@ function mail_edit_trans(&$form_status, 
   if ($update) {
     $form['delete'] = array(
       '#type'       => 'submit',
-      '#value'      => t('Remove '. $lang.' translation'),
+      '#value'      => t('Remove @language translation', array('@language' => $lang)),
       '#submit'     => array('mail_edit_trans_delete'),
     );
   }
@@ -140,10 +144,10 @@ function mail_edit_trans_delete($form, &
   $args[] = $form_state['values']['id'];
   $args[] = $form_state['values']['language'];
   if (db_query($query, $args)) {
-    drupal_set_message($form_state['values']['language'].' translation of '. $form_state['values']['id']. ' has been removed');
+    drupal_set_message(t('@language translation of @id has been removed', array('@language' => $form_state['values']['language'], '@id' => $form_state['values']['id'])));
   }
   else {
-    drupal_set_message('Failed to remove '. $form_state['values']['language'].' translation of '. $form_state['values']['id']);
+    drupal_set_message(t('Failed to remove @language translation of @id', array('@language' => $form_state['values']['language'], '@id' => $form_state['values']['id'])));
   }
   $form_state['redirect'] = 'admin/build/mail-edit';
 
@@ -283,7 +287,7 @@ function mail_edit_list() {
   }
 
   //step 5 : build mailkey to translation relationship matrix
-  $header = array('Mailkey');
+  $header = array(t('Mailkey'));
   foreach ( $mail_langs as $lang => $desc) {
     $header[$lang] = $lang;
   }
@@ -301,10 +305,10 @@ function mail_edit_list() {
         $extra = '*';$has_extra = true;
       }
       if (isset($template['languages'][$lang_key])) {
-        $row[] = l('Edit '.$lang_key . $extra, 'admin/build/mail-edit/'. $key. '/'. $lang_key);
+        $row[] = l(t('Edit @language', array('@language' => $lang_key)) . $extra, 'admin/build/mail-edit/'. $key. '/'. $lang_key);
       }
       else {
-        $row[] = l('Add '. $lang_key . $extra, 'admin/build/mail-edit/'. $key. '/'. $lang_key);
+        $row[] = l(t('Add @language', array('@language' => $lang_key)) . $extra, 'admin/build/mail-edit/'. $key. '/'. $lang_key);
       }
     }
     $rows[] = $row;
Index: mail_edit_user.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mail_edit/Attic/mail_edit_user.inc,v
retrieving revision 1.1.2.3
diff -b -u -p -r1.1.2.3 mail_edit_user.inc
--- mail_edit_user.inc	17 May 2010 22:19:52 -0000	1.1.2.3
+++ mail_edit_user.inc	20 Sep 2010 00:08:30 -0000
@@ -28,16 +28,16 @@ function user_mail_edit_tokens_list($mai
     case 'status_activated':
     case 'status_blocked':
     case 'status_deleted':
-      $tokens['!username']= "User's username";
-      $tokens['!username_themed']= "User's username (themed)";
-      $tokens['!site']= 'Site name';
-      $tokens['!login_url']= 'One time login URL for password reset';
-      $tokens['!uri_brief']= "Website's URL without the leading http://";
-      $tokens['!uri']= "Website's URL";
-      $tokens['!mailto']= "User's Email address (email address to which this email is being sent to)";
-      $tokens['!date']= "Date and time when this email is sent";
-      $tokens['!login_uri'] = "URL to user's profile or login form if user is not logged in";
-      $tokens['!edit_uri'] = "URL to user's profile edit page";
+      $tokens['!username']= t("User's username");
+      $tokens['!username_themed']= t("User's username (themed)");
+      $tokens['!site']= t('Site name');
+      $tokens['!login_url']= t('One time login URL for password reset');
+      $tokens['!uri_brief']= ("Website's URL without the leading http://");
+      $tokens['!uri']= t("Website's URL");
+      $tokens['!mailto']= t("User's Email address (email address to which this email is being sent to)");
+      $tokens['!date']= t("Date and time when this email is sent");
+      $tokens['!login_uri'] = t("URL to user's profile or login form if user is not logged in");
+      $tokens['!edit_uri'] = t("URL to user's profile edit page");
       break;
   }
   return $tokens;