diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-09 23:03:22 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-09 23:03:22 +0000 |
commit | 71ee49de3eba0639d13a5861803f1cf031f376df (patch) | |
tree | 7e9a559099ad267e58e58879dae8246e1bf5cdf2 /includes | |
parent | a895a366c56fc3a03303e5341e222b7ad097952b (diff) | |
download | brdo-71ee49de3eba0639d13a5861803f1cf031f376df.tar.gz brdo-71ee49de3eba0639d13a5861803f1cf031f376df.tar.bz2 |
#679890 follow-up by Bojhan, aspilicious, and agentrickard: Remove more extraneous 'Please' in the interface.
Diffstat (limited to 'includes')
-rw-r--r-- | includes/authorize.inc | 2 | ||||
-rw-r--r-- | includes/database/pgsql/install.inc | 4 | ||||
-rw-r--r-- | includes/filetransfer/ftp.inc | 4 | ||||
-rw-r--r-- | includes/install.inc | 6 | ||||
-rw-r--r-- | includes/mail.inc | 2 | ||||
-rw-r--r-- | includes/theme.maintenance.inc | 2 | ||||
-rw-r--r-- | includes/update.inc | 2 |
7 files changed, 11 insertions, 11 deletions
diff --git a/includes/authorize.inc b/includes/authorize.inc index 772481b2d..1d354657e 100644 --- a/includes/authorize.inc +++ b/includes/authorize.inc @@ -43,7 +43,7 @@ function authorize_filetransfer_form($form_state) { $form['information']['main_header'] = array( '#prefix' => '<h3>', - '#markup' => t('To continue, please provide your server connection details'), + '#markup' => t('To continue, provide your server connection details'), '#suffix' => '</h3>', ); diff --git a/includes/database/pgsql/install.inc b/includes/database/pgsql/install.inc index a174bd05c..72f2865d3 100644 --- a/includes/database/pgsql/install.inc +++ b/includes/database/pgsql/install.inc @@ -42,7 +42,7 @@ class DatabaseTasks_pgsql extends DatabaseTasks { '!link' => '<a href="INSTALL.pgsql.txt">INSTALL.pgsql.txt</a>' ); $text = 'The %driver database must use %encoding encoding to work with Drupal.'; - $text .= 'Please recreate the database with %encoding encoding. See !link for more details.'; + $text .= 'Recreate the database with %encoding encoding. See !link for more details.'; $this->fail(st($text, $replacements)); } } catch (Exception $e) { @@ -100,7 +100,7 @@ class DatabaseTasks_pgsql extends DatabaseTasks { $this->pass(st('PostgreSQL has initialized itself.')); } catch (Exception $e) { - $this->fail(st('Drupal could not be correctly setup with the existing database. Please revise any errors.')); + $this->fail(st('Drupal could not be correctly setup with the existing database. Revise any errors.')); } } } diff --git a/includes/filetransfer/ftp.inc b/includes/filetransfer/ftp.inc index d392e16cb..e3606c291 100644 --- a/includes/filetransfer/ftp.inc +++ b/includes/filetransfer/ftp.inc @@ -112,10 +112,10 @@ class FileTransferFTPExtension extends FileTransferFTP implements FileTransferCh $this->connection = ftp_connect($this->hostname, $this->port); if (!$this->connection) { - throw new FileTransferException("Cannot connect to FTP Server, please check settings"); + throw new FileTransferException("Cannot connect to FTP Server, 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 login to FTP server. Check username and password"); } } diff --git a/includes/install.inc b/includes/install.inc index 59437c909..6f876b2c3 100644 --- a/includes/install.inc +++ b/includes/install.inc @@ -475,11 +475,11 @@ function drupal_rewrite_settings($settings = array(), $prefix = '') { $fp = fopen(DRUPAL_ROOT . '/' . $settings_file, 'w'); if ($fp && fwrite($fp, $buffer) === FALSE) { - throw new Exception(st('Failed to modify %settings, please verify the file permissions.', array('%settings' => $settings_file))); + throw new Exception(st('Failed to modify %settings. Verify the file permissions.', array('%settings' => $settings_file))); } } else { - throw new Exception(st('Failed to open %settings, please verify the file permissions.', array('%settings' => $default_settings))); + throw new Exception(st('Failed to open %settings. Verify the file permissions.', array('%settings' => $default_settings))); } } @@ -529,7 +529,7 @@ function drupal_verify_profile($install_state) { 'title' => st('Required modules'), 'value' => st('Required modules not found.'), 'severity' => REQUIREMENT_ERROR, - 'description' => st('The following modules are required but were not found. Please move them into the appropriate modules subdirectory, such as <em>sites/all/modules</em>. Missing modules: !modules', array('!modules' => implode(', ', $modules))), + 'description' => st('The following modules are required but were not found. Move them into the appropriate modules subdirectory, such as <em>sites/all/modules</em>. Missing modules: !modules', array('!modules' => implode(', ', $modules))), ); } return $requirements; diff --git a/includes/mail.inc b/includes/mail.inc index 2a2541265..352df9976 100644 --- a/includes/mail.inc +++ b/includes/mail.inc @@ -151,7 +151,7 @@ function drupal_mail($module, $key, $to, $language, $params = array(), $from = N // Log errors if (!$message['result']) { watchdog('mail', 'Error sending e-mail (from %from to %to).', array('%from' => $message['from'], '%to' => $message['to']), WATCHDOG_ERROR); - drupal_set_message(t('Unable to send e-mail. Please contact the site administrator if the problem persists.'), 'error'); + drupal_set_message(t('Unable to send e-mail. Contact the site administrator if the problem persists.'), 'error'); } } diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index 14d543f29..9c90de6cc 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -144,7 +144,7 @@ function theme_install_page($variables) { $title = count($messages['error']) > 1 ? st('The following errors must be resolved before you can continue the installation process') : st('The following error must be resolved before you can continue the installation process'); $variables['messages'] .= '<h3>' . $title . ':</h3>'; $variables['messages'] .= theme('status_messages', array('display' => 'error')); - $variables['content'] .= '<p>' . st('Please check the error messages and <a href="!url">try again</a>.', array('!url' => request_uri())) . '</p>'; + $variables['content'] .= '<p>' . st('Check the error messages and <a href="!url">try again</a>.', array('!url' => request_uri())) . '</p>'; } // Special handling of warning messages diff --git a/includes/update.inc b/includes/update.inc index 97a878480..40cf106d4 100644 --- a/includes/update.inc +++ b/includes/update.inc @@ -84,7 +84,7 @@ function update_prepare_d7_bootstrap() { 'title' => 'Settings file', 'value' => $writable ? 'The settings file is writable.' : 'The settings file is not writable.', 'severity' => $writable ? REQUIREMENT_OK : REQUIREMENT_ERROR, - 'description' => $writable ? '' : 'Drupal requires write permissions to <em>' . $settings_file . '</em> during the update process. If you are unsure how to grant file permissions, please consult the <a href="http://drupal.org/server-permissions">online handbook</a>.', + 'description' => $writable ? '' : 'Drupal requires write permissions to <em>' . $settings_file . '</em> during the update process. If you are unsure how to grant file permissions, consult the <a href="http://drupal.org/server-permissions">online handbook</a>.', ), ); update_extra_requirements($requirements); |