Index: modules/openid/openid.module =================================================================== RCS file: /cvs/drupal/drupal/modules/openid/openid.module,v retrieving revision 1.68 diff -u -r1.68 openid.module --- modules/openid/openid.module 4 Dec 2009 16:49:47 -0000 1.68 +++ modules/openid/openid.module 7 Jan 2010 18:19:25 -0000 @@ -46,7 +46,7 @@ case 'user/%/openid': $output = '

' . t('This site supports OpenID, a secure way to log into many websites using a single username and password. OpenID can reduce the necessity of managing many usernames and passwords for many websites.', array('@openid-net' => 'http://openid.net')) . '

'; $output .= '

' . t('To use OpenID you must first establish an identity on a public or private OpenID server. If you do not have an OpenID and would like one, look into one of the free public providers. You can find out more about OpenID at this website.', array('@openid-providers' => 'http://openid.net/get/', '@openid-net' => 'http://openid.net')) . '

'; - $output .= '

' . t('If you already have an OpenID, enter the URL to your OpenID server below (e.g. myusername.openidprovider.com). Next time you login, you will be able to use this URL instead of a regular username and password. You can have multiple OpenID servers if you like; just keep adding them here.') . '

'; + $output .= '

' . t('If you already have an OpenID, enter the URL to your OpenID server below (e.g. myusername.openidprovider.com). Next time you log in, you will be able to use this URL instead of a regular username and password. You can have multiple OpenID servers if you like; just keep adding them here.') . '

'; return $output; case 'admin/help#openid': $output = ''; @@ -66,7 +66,7 @@ */ function openid_user_insert(&$edit, $account, $category) { if (isset($_SESSION['openid']['values'])) { - // The user has registered after trying to login via OpenID. + // The user has registered after trying to log in via OpenID. if (variable_get('user_email_verification', TRUE)) { drupal_set_message(t('Once you have verified your e-mail address, you may log in via OpenID.')); } Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.826 diff -u -r1.826 comment.module --- modules/comment/comment.module 5 Jan 2010 18:56:48 -0000 1.826 +++ modules/comment/comment.module 7 Jan 2010 18:19:25 -0000 @@ -2152,11 +2152,11 @@ if (variable_get('user_register', 1)) { // Users can register themselves. - return t('Login or register to post comments', array('@login' => url('user/login', array('query' => $destination)), '@register' => url('user/register', array('query' => $destination)))); + return t('Log in or register to post comments', array('@login' => url('user/login', array('query' => $destination)), '@register' => url('user/register', array('query' => $destination)))); } else { // Only admins can add new users, no public registration. - return t('Login to post comments', array('@login' => url('user/login', array('query' => $destination)))); + return t('Log in to post comments', array('@login' => url('user/login', array('query' => $destination)))); } } } Index: modules/comment/comment.test =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v retrieving revision 1.61 diff -u -r1.61 comment.test --- modules/comment/comment.test 5 Jan 2010 18:56:49 -0000 1.61 +++ modules/comment/comment.test 7 Jan 2010 18:19:25 -0000 @@ -575,7 +575,7 @@ )); $this->drupalGet('node/' . $this->node->nid); $this->assertPattern('/
]*?)id="comments"([^>]*?)>/', t('Comments were displayed.')); - $this->assertLink('Login', 1, t('Link to login was found.')); + $this->assertLink('Log in', 1, t('Link to log in was found.')); $this->assertLink('register', 1, t('Link to register was found.')); } } Index: INSTALL.mysql.txt =================================================================== RCS file: /cvs/drupal/drupal/INSTALL.mysql.txt,v retrieving revision 1.11 diff -u -r1.11 INSTALL.mysql.txt --- INSTALL.mysql.txt 25 Apr 2009 16:57:19 -0000 1.11 +++ INSTALL.mysql.txt 7 Jan 2010 18:19:25 -0000 @@ -14,7 +14,7 @@ mysqladmin -u username -p create databasename MySQL will prompt for the 'username' database password and then create the -initial database files. Next you must login and set the access database rights: +initial database files. Next you must log in and set the access database rights: mysql -u username -p Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.1098 diff -u -r1.1098 user.module --- modules/user/user.module 3 Jan 2010 21:01:04 -0000 1.1098 +++ modules/user/user.module 7 Jan 2010 18:19:26 -0000 @@ -3174,7 +3174,7 @@ if ($admin && !$notify) { drupal_set_message(t('Created a new user account for %name. No e-mail has been sent.', array('@url' => url("user/$account->uid"), '%name' => $account->name))); } - // No e-mail verification required; login user immediately. + // No e-mail verification required; log in user immediately. elseif (!$admin && !variable_get('user_email_verification', TRUE) && $account->status) { _user_mail_notify('register_no_approval_required', $account); $form_state['uid'] = $account->uid; Index: modules/user/user.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v retrieving revision 1.62 diff -u -r1.62 user.pages.inc --- modules/user/user.pages.inc 1 Dec 2009 16:03:35 -0000 1.62 +++ modules/user/user.pages.inc 7 Jan 2010 18:19:26 -0000 @@ -119,11 +119,11 @@ // user_login_finalize() also updates the login timestamp of the // user, which invalidates further use of the one-time login link. user_login_finalize(); - drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to login. Please change your password.')); + drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to log in. Please change your password.')); drupal_goto('user/' . $user->uid . '/edit'); } else { - $form['message'] = array('#markup' => t('

This is a one-time login for %user_name and will expire on %expiration_date.

Click on this button to login to the site and change your password.

', array('%user_name' => $account->name, '%expiration_date' => format_date($timestamp + $timeout)))); + $form['message'] = array('#markup' => t('

This is a one-time login for %user_name and will expire on %expiration_date.

Click on this button to log in to the site and change your password.

', array('%user_name' => $account->name, '%expiration_date' => format_date($timestamp + $timeout)))); $form['help'] = array('#markup' => '

' . t('This login can be used only once.') . '

'); $form['submit'] = array('#type' => 'submit', '#value' => t('Log in')); $form['#action'] = url("user/reset/$uid/$timestamp/$hashed_pass/login"); @@ -131,7 +131,7 @@ } } else { - drupal_set_message(t('You have tried to use a one-time login link which has either been used or is no longer valid. Please request a new one using the form below.')); + drupal_set_message(t('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.')); drupal_goto('user/password'); } } Index: modules/simpletest/drupal_web_test_case.php =================================================================== RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_web_test_case.php,v retrieving revision 1.188 diff -u -r1.188 drupal_web_test_case.php --- modules/simpletest/drupal_web_test_case.php 4 Jan 2010 23:08:34 -0000 1.188 +++ modules/simpletest/drupal_web_test_case.php 7 Jan 2010 18:19:25 -0000 @@ -1021,7 +1021,7 @@ * populated with data of the logged in user. If you need full access to the * user object after logging in, it must be updated manually. If you also need * access to the plain-text password of the user (set by drupalCreateUser()), - * e.g. to login the same user again, then it must be re-assigned manually. + * e.g. to log in the same user again, then it must be re-assigned manually. * For example: * @code * // Create a user. @@ -1034,7 +1034,7 @@ * @endcode * * @param $user - * User object representing the user to login. + * User object representing the user to log in. * * @see drupalCreateUser() */ Index: includes/filetransfer/ftp.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/filetransfer/ftp.inc,v retrieving revision 1.10 diff -u -r1.10 ftp.inc --- includes/filetransfer/ftp.inc 4 Dec 2009 16:31:04 -0000 1.10 +++ includes/filetransfer/ftp.inc 7 Jan 2010 18:19:25 -0000 @@ -115,7 +115,7 @@ throw new FileTransferException("Cannot connect to FTP Server, please check settings"); } if (!ftp_login($this->connection, $this->username, $this->password)) { - throw new FileTransferException("Cannot login to FTP server, please check username and password"); + throw new FileTransferException("Cannot log in to FTP server, please check username and password"); } } Index: modules/forum/forum.module =================================================================== RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v retrieving revision 1.548 diff -u -r1.548 forum.module --- modules/forum/forum.module 6 Jan 2010 15:19:24 -0000 1.548 +++ modules/forum/forum.module 7 Jan 2010 18:19:25 -0000 @@ -196,7 +196,7 @@ $links['login'] = array( '#theme' => 'menu_local_action', '#link' => array( - 'title' => t('Login to post new content in the forum.', array( + 'title' => t('Log in to post new content in the forum.', array( '@login' => url('user/login', array('query' => drupal_get_destination())), )), 'localized_options' => array('html' => TRUE),