Index: persistent_login.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/persistent_login/persistent_login.module,v
retrieving revision 1.9.2.7
diff -u -r1.9.2.7 persistent_login.module
--- persistent_login.module	15 Feb 2007 19:04:31 -0000	1.9.2.7
+++ persistent_login.module	21 Jul 2007 10:06:05 -0000
@@ -69,11 +69,7 @@
     return;
 
   if (ini_get('session.cookie_lifetime') > 0) {
-    drupal_set_message(t('Your site\'s <em>session.cookie_lifetime</em> '.
-			 'PHP setting is %life.  When using Persistent Login, '.
-			 'it should be 0 so that PHP sessions end when '.
-			 'the user closes his/her browser.  You can change '.
-			 'this setting by editing <strong>%file</strong>.',
+    drupal_set_message(t("Your site's <em>session.cookie_lifetime</em> PHP setting is %life. When using Persistent Login, it should be 0 so that PHP sessions end when the user closes his/her browser. You can change this setting by editing <strong>%file</strong>.",
 			 array('%life' => ini_get('session.cookie_lifetime'),
 			       '%file' => conf_path().'/settings.php')),
 		       'error');
@@ -84,9 +80,7 @@
      '#title' => 'Days to remember the user',
      '#default_value' => variable_get('persistent_login_maxlife', 
 				      PERSISTENT_LOGIN_MAXLIFE),
-     '#description' => t('The maximum number of days for which a persistent '.
-			 'login session is valid; afterwards, the user will '.
-			 'need to log in again.  Enter 0 for no expiration.'));
+     '#description' => t('The maximum number of days for which a persistent login session is valid; afterwards, the user will need to log in again. Enter 0 for no expiration.'));
   $form['persistent_login_secure'] = array(
     '#type' => 'radios',
     '#title' => t('Pages which require an explicit login'),
@@ -186,15 +180,7 @@
 			      $account->uid, time()));
       $items[] = array
 	('title' => t('Remembered logins'),
-	 'value' => (t('@acct %n persistent login session(s) created with '.
-		       'the "Remember Me" login option on this site.  '.
-		       'If you no longer trust the computer(s) on which '.
-		       'these remembered sessions were created or think '.
-		       'your account has been compromised for any reason, '.
-		       'you can !erase_link.  This will not log you out of '.
-		       'your current session but you will have to provide '.
-		       'your username and password to log in the next time '.
-		       'you visit this site.',
+	 'value' => (t('@acct %n persistent login session(s) created with the "Remember Me" login option on this site. If you no longer trust the computer(s) on which these remembered sessions were created or think your account has been compromised for any reason, you can !erase_link. This will not log you out of your current session but you will have to provide your username and password to log in the next time you visit this site.',
 		       array('@acct' => (($user->uid == $account->uid) ? 
 					 t('You have') : 
 					 t('User @user has',
@@ -363,19 +349,7 @@
 			     '%user detected.',
 			     array('%user' => check_plain($r['name']))));
       drupal_set_message
-	(t('<p><b>SECURITY ALERT!</b></p>'.
-	   '<p>You previously logged in to this site and checked the '.
-	   '<em>Remember me</em> box.  At that time, this site stored '.
-	   'a "login cookie" on your web browser that it uses to '.
-	   'identify you each time you return.</p>'.
-	   '<p>However, the login cookie that your browser just provided is '.
-	   'incorrect.  One possible cause of this error is that '.
-	   'your web browser cookies have been stolen and used '.
-	   'by someone else to impersonate you at this site.</p>'.
-	   '<p>As a precaution, we have deactivated all your remembered '.
-	   'logins to this site.  '.
-	   'You can log in again to this site with your username and '.
-	   'password.</p>'),
+	(t('<p><b>SECURITY ALERT!</b></p><p>You previously logged in to this site and checked the <em>Remember me</em> box. At that time, this site stored a "login cookie" on your web browser that it uses to identify you each time you return.</p><p>However, the login cookie that your browser just provided is incorrect. One possible cause of this error is that your web browser cookies have been stolen and used by someone else to impersonate you at this site.</p><p>As a precaution, we have deactivated all your remembered logins to this site. You can log in again to this site with your username and password.</p>'),
 	 'error');
       drupal_goto();
       return;
@@ -395,8 +369,7 @@
       unset($_SESSION['persistent_login_login']);
       $_SESSION['persistent_login_reauth'] = TRUE;
       unset($_REQUEST['destination']);
-      drupal_set_message(t('Please verify your username and password to '.
-			   'access this page.'), 'error');
+      drupal_set_message(t('Please verify your username and password to access this page.'), 'error');
       drupal_goto('user/login', drupal_get_destination());
     }
   }