? 695952-masquerade-d6.patch
? masq-strings-d6.patch
Index: masquerade.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/masquerade/masquerade.module,v
retrieving revision 1.16.2.40
diff -u -p -r1.16.2.40 masquerade.module
--- masquerade.module	25 Jun 2010 14:59:17 -0000	1.16.2.40
+++ masquerade.module	14 Jul 2010 08:22:11 -0000
@@ -652,7 +652,7 @@ function masquerade_switch_user($uid) {
   }
 
   if ($user->uid == $uid || isset($user->masquerading)) {
-    watchdog('masquerade', 'This user is all ready %user.', array('%user' => $new_user->name), WATCHDOG_ERROR);
+    watchdog('masquerade', 'This user is already %user.', array('%user' => $new_user->name), WATCHDOG_ERROR);
     return FALSE;
   }
 
@@ -665,7 +665,7 @@ function masquerade_switch_user($uid) {
   $user->uid, $new_user->uid, session_id());
   // switch user
 
-  watchdog('masquerade', 'User %user now masquerading as %masq_as.', array('%user' => $user->name, '%masq_as' => $new_user->name ? $new_user->name : variable_get('anonymous', 'Anonymous')), WATCHDOG_INFO);
+  watchdog('masquerade', 'User %user now masquerading as %masq_as.', array('%user' => $user->name, '%masq_as' => $new_user->name ? $new_user->name : variable_get('anonymous', t('Anonymous'))), WATCHDOG_INFO);
   drupal_set_message(t('You are now masquerading as !masq_as.', array('!masq_as' => theme('username', $new_user))));
   $user->masquerading = $new_user->uid;
   $user = $new_user;
@@ -699,7 +699,7 @@ function masquerade_switch_back() {
   $uid = db_result(db_query("SELECT m.uid_from FROM {masquerade} m WHERE m.sid = '%s' AND m.uid_as = %d ", session_id(), $user->uid));
   // erase record
   db_query("DELETE FROM {masquerade} WHERE sid = '%s' AND uid_as = %d ", session_id(), $user->uid);
-  $oldname = ($user->uid == 0 ? variable_get('anonymous', 'Anonymous') : $user->name);
+  $oldname = ($user->uid == 0 ? variable_get('anonymous', t('Anonymous')) : $user->name);
   $user = user_load(array('uid' => $uid));
   watchdog('masquerade', 'User %user no longer masquerading as %masq_as.', array('%user' => $user->name, '%masq_as' => $oldname), WATCHDOG_INFO);
 }