diff --git a/includes/authorize.inc b/includes/authorize.inc
index 772481b2dfe5765cf81583774493f12abb5973ea..1d354657e35fcf607546b8796180dabbc3a6a580 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 a174bd05c4649b78916f306c91caef884f7a56b3..72f2865d301e70fcb2733aad8411cd06e2d2bafc 100644
--- a/includes/database/pgsql/install.inc
+++ b/includes/database/pgsql/install.inc
@@ -42,7 +42,7 @@ protected function checkEncoding() {
'!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 @@ function initializeDatabase() {
$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 d392e16cb0f5e8150bbac632cfcf8b8b6e5325d9..e3606c29175c12fed131215111ea92b45f10a7ba 100644
--- a/includes/filetransfer/ftp.inc
+++ b/includes/filetransfer/ftp.inc
@@ -112,10 +112,10 @@ public function connect() {
$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 59437c909ab89b06d842462c24f9e1ca66de7d3b..6f876b2c3889401aa062354a12fc541fe3440e41 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 2a254126507ded32870072786e52ee6dea0035c0..352df99765b1d314d091c10899289932393c00c7 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 14d543f2960f68fa860584018b98fbbb7e3345fa..9c90de6cc550fdfa8e88d5f1382421c25df49975 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 97a8784804156a35011de1213d242c3773bd4397..40cf106d482363d08fad15789ad7f0da44eca339 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);
diff --git a/modules/aggregator/aggregator.admin.inc b/modules/aggregator/aggregator.admin.inc
index 9e1fdfbcb1c3434fc0a54a306442fa1007e2fc74..6fd0e689dd003e31b646c8336d7c8c2039ad2eea 100644
--- a/modules/aggregator/aggregator.admin.inc
+++ b/modules/aggregator/aggregator.admin.inc
@@ -127,7 +127,7 @@ function aggregator_form_feed_validate($form, &$form_state) {
if ($form_state['values']['op'] == t('Save')) {
// Ensure URL is valid.
if (!valid_url($form_state['values']['url'], TRUE)) {
- form_set_error('url', t('The URL %url is invalid. Please enter a fully-qualified URL, such as http://www.example.com/feed.xml.', array('%url' => $form_state['values']['url'])));
+ form_set_error('url', t('The URL %url is invalid. Enter a fully-qualified URL, such as http://www.example.com/feed.xml.', array('%url' => $form_state['values']['url'])));
}
// Check for duplicate titles.
if (isset($form_state['values']['fid'])) {
@@ -138,10 +138,10 @@ function aggregator_form_feed_validate($form, &$form_state) {
}
foreach ($result as $feed) {
if (strcasecmp($feed->title, $form_state['values']['title']) == 0) {
- form_set_error('title', t('A feed named %feed already exists. Please enter a unique title.', array('%feed' => $form_state['values']['title'])));
+ form_set_error('title', t('A feed named %feed already exists. Enter a unique title.', array('%feed' => $form_state['values']['title'])));
}
if (strcasecmp($feed->url, $form_state['values']['url']) == 0) {
- form_set_error('url', t('A feed with this URL %url already exists. Please enter a unique URL.', array('%url' => $form_state['values']['url'])));
+ form_set_error('url', t('A feed with this URL %url already exists. Enter a unique URL.', array('%url' => $form_state['values']['url'])));
}
}
}
@@ -525,7 +525,7 @@ function aggregator_form_category_validate($form, &$form_state) {
$category = db_query("SELECT cid FROM {aggregator_category} WHERE title = :title", array(':title' => $form_state['values']['title']))->fetchObject();
}
if ($category) {
- form_set_error('title', t('A category named %category already exists. Please enter a unique title.', array('%category' => $form_state['values']['title'])));
+ form_set_error('title', t('A category named %category already exists. Enter a unique title.', array('%category' => $form_state['values']['title'])));
}
}
}
diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc
index e475302ec7842530245b0048f0c63362662b4ebd..128cee8b2a11bfafdae3f8395c4dfd5c27f271a3 100644
--- a/modules/block/block.admin.inc
+++ b/modules/block/block.admin.inc
@@ -384,7 +384,7 @@ function block_admin_configure_validate($form, &$form_state) {
':info' => $form_state['values']['info'],
))->fetchField();
if (empty($form_state['values']['info']) || $custom_block_exists) {
- form_set_error('info', t('Please ensure that each block description is unique.'));
+ form_set_error('info', t('Ensure that each block description is unique.'));
}
}
}
@@ -462,7 +462,7 @@ function block_add_block_form_validate($form, &$form_state) {
$custom_block_exists = (bool) db_query_range('SELECT 1 FROM {block_custom} WHERE info = :info', 0, 1, array(':info' => $form_state['values']['info']))->fetchField();
if (empty($form_state['values']['info']) || $custom_block_exists) {
- form_set_error('info', t('Please ensure that each block description is unique.'));
+ form_set_error('info', t('Ensure that each block description is unique.'));
}
}
diff --git a/modules/block/block.test b/modules/block/block.test
index 08ef8082d8c214958f5d59ed68441cde02e5404a..91be85e2f7443c79969c2b731abeaa402c032c20 100644
--- a/modules/block/block.test
+++ b/modules/block/block.test
@@ -99,7 +99,7 @@ class BlockTestCase extends DrupalWebTestCase {
$this->drupalGet('admin/structure/block/manage/block/' . $bid . '/configure');
$this->assertNoText(t('Block body'));
$this->drupalPost('admin/structure/block/manage/block/' . $bid . '/configure', array(), t('Save block'));
- $this->assertNoText(t('Please ensure that each block description is unique.'));
+ $this->assertNoText(t('Ensure that each block description is unique.'));
// Confirm that the custom block is still being displayed using configured text format.
$this->drupalGet('node');
diff --git a/modules/color/color.install b/modules/color/color.install
index 6af5f72612b26c7301d9e2fe503bba053382d45c..3e86528c2a19c305f06a22dba670fc79b5884c1c 100644
--- a/modules/color/color.install
+++ b/modules/color/color.install
@@ -23,14 +23,14 @@ function color_requirements($phase) {
}
else {
$requirements['gd']['severity'] = REQUIREMENT_ERROR;
- $requirements['gd']['description'] = t('The GD library for PHP is enabled, but was compiled without PNG support. Please check the <a href="@url">PHP image documentation</a> for information on how to correct this.', array('@url' => 'http://www.php.net/manual/ref.image.php'));
+ $requirements['gd']['description'] = t('The GD library for PHP is enabled, but was compiled without PNG support. Check the <a href="@url">PHP image documentation</a> for information on how to correct this.', array('@url' => 'http://www.php.net/manual/ref.image.php'));
}
}
else {
$requirements['gd'] = array(
'value' => t('Not installed'),
'severity' => REQUIREMENT_ERROR,
- 'description' => t('The GD library for PHP is missing or outdated. Please check the <a href="@url">PHP image documentation</a> for information on how to correct this.', array('@url' => 'http://www.php.net/manual/ref.image.php')),
+ 'description' => t('The GD library for PHP is missing or outdated. Check the <a href="@url">PHP image documentation</a> for information on how to correct this.', array('@url' => 'http://www.php.net/manual/ref.image.php')),
);
}
$requirements['gd']['title'] = t('GD library');
diff --git a/modules/comment/comment.admin.inc b/modules/comment/comment.admin.inc
index 5fed67a354a6125c1ab543bf935f2444f201d06f..706b10ff2bde3cb7ffcc9f50fa189c04a649d740 100644
--- a/modules/comment/comment.admin.inc
+++ b/modules/comment/comment.admin.inc
@@ -140,7 +140,7 @@ function comment_admin_overview_validate($form, &$form_state) {
$form_state['values']['comments'] = array_diff($form_state['values']['comments'], array(0));
// We can't execute any 'Update options' if no comments were selected.
if (count($form_state['values']['comments']) == 0) {
- form_set_error('', t('Please select one or more comments to perform the update on.'));
+ form_set_error('', t('Select one or more comments to perform the update on.'));
}
}
diff --git a/modules/contact/contact.pages.inc b/modules/contact/contact.pages.inc
index 17e1bf1bc1de37005b2c48e0fdfa0f1ef93d5ef9..9059749e9303c3b33062a2f74b88e6d438eb2472 100644
--- a/modules/contact/contact.pages.inc
+++ b/modules/contact/contact.pages.inc
@@ -19,7 +19,7 @@ function contact_site_form($form, &$form_state) {
$limit = variable_get('contact_threshold_limit', 5);
$window = variable_get('contact_threshold_window', 3600);
if (!flood_is_allowed('contact', $limit, $window) && !user_access('administer contact forms')) {
- drupal_set_message(t("You cannot send more than %limit messages in @interval. Please try again later.", array('%limit' => $limit, '@interval' => format_interval($window))), 'error');
+ drupal_set_message(t("You cannot send more than %limit messages in @interval. Try again later.", array('%limit' => $limit, '@interval' => format_interval($window))), 'error');
drupal_access_denied();
drupal_exit();
}
@@ -178,7 +178,7 @@ function contact_personal_form($form, &$form_state, $recipient) {
$limit = variable_get('contact_threshold_limit', 5);
$window = variable_get('contact_threshold_window', 3600);
if (!flood_is_allowed('contact', $limit, $window) && !user_access('administer contact forms') && !user_access('administer users')) {
- drupal_set_message(t("You cannot send more than %limit messages in @interval. Please try again later.", array('%limit' => $limit, '@interval' => format_interval($window))), 'error');
+ drupal_set_message(t("You cannot send more than %limit messages in @interval. Try again later.", array('%limit' => $limit, '@interval' => format_interval($window))), 'error');
drupal_access_denied();
drupal_exit();
}
diff --git a/modules/contact/contact.test b/modules/contact/contact.test
index 3b6f90a826ab7a8d4506aaa7f3c488648ddb8dc0..02adc9709cf8d983b9b445525307e6463e476334 100644
--- a/modules/contact/contact.test
+++ b/modules/contact/contact.test
@@ -145,7 +145,7 @@ class ContactSitewideTestCase extends DrupalWebTestCase {
// Submit contact form one over limit.
$this->drupalGet('contact');
$this->assertResponse(403, t('Access denied to anonymous user after reaching message treshold.'));
- $this->assertRaw(t('You cannot send more than %number messages in @interval. Please try again later.', array('%number' => variable_get('contact_threshold_limit', 3), '@interval' => format_interval(600))), t('Message threshold reached.'));
+ $this->assertRaw(t('You cannot send more than %number messages in @interval. Try again later.', array('%number' => variable_get('contact_threshold_limit', 3), '@interval' => format_interval(600))), t('Message threshold reached.'));
// Delete created categories.
$this->drupalLogin($admin_user);
@@ -371,12 +371,12 @@ class ContactPersonalTestCase extends DrupalWebTestCase {
// Submit contact form one over limit.
$this->drupalGet('user/' . $this->contact_user->uid. '/contact');
- $this->assertRaw(t('You cannot send more than %number messages in @interval. Please try again later.', array('%number' => $flood_limit, '@interval' => format_interval(variable_get('contact_threshold_window', 3600)))), 'Normal user denied access to flooded contact form.');
+ $this->assertRaw(t('You cannot send more than %number messages in @interval. Try again later.', array('%number' => $flood_limit, '@interval' => format_interval(variable_get('contact_threshold_window', 3600)))), 'Normal user denied access to flooded contact form.');
// Test that the admin user can still access the contact form even though
// the flood limit was reached.
$this->drupalLogin($this->admin_user);
- $this->assertNoText('Please try again later.', 'Admin user not denied access to flooded contact form.');
+ $this->assertNoText('Try again later.', 'Admin user not denied access to flooded contact form.');
}
/**
diff --git a/modules/help/help.module b/modules/help/help.module
index 6129e66eecb667559045230c7b7679838bb7cb54..bdb3796d504a0a2bc74e769e0515661863793dde 100644
--- a/modules/help/help.module
+++ b/modules/help/help.module
@@ -38,14 +38,14 @@ function help_menu() {
function help_help($path, $arg) {
switch ($path) {
case 'admin/help':
- $output = '<p>' . t('Please follow these steps to set up and start using your website:') . '</p>';
+ $output = '<p>' . t('Follow these steps to set up and start using your website:') . '</p>';
$output .= '<ol>';
$output .= '<li>' . t('<strong>Configure your website</strong> Once logged in, visit the <a href="@admin">administration section</a>, where you can <a href="@config">customize and configure</a> all aspects of your website.', array('@admin' => url('admin'), '@config' => url('admin/config'))) . '</li>';
$output .= '<li>' . t('<strong>Enable additional functionality</strong> Next, visit the <a href="@modules">module list</a> and enable features which suit your specific needs. You can find additional modules in the <a href="@download_modules">Drupal modules download section</a>.', array('@modules' => url('admin/modules'), '@download_modules' => 'http://drupal.org/project/modules')) . '</li>';
$output .= '<li>' . t('<strong>Customize your website design</strong> To change the "look and feel" of your website, visit the <a href="@themes">themes section</a>. You may choose from one of the included themes or download additional themes from the <a href="@download_themes">Drupal themes download section</a>.', array('@themes' => url('admin/appearance'), '@download_themes' => 'http://drupal.org/project/themes')) . '</li>';
$output .= '<li>' . t('<strong>Start posting content</strong> Finally, you can <a href="@content">add new content</a> for your website.', array('@content' => url('node/add'))) . '</li>';
$output .= '</ol>';
- $output .= '<p>' . t('For more information, please refer to the specific topics listed in the next section, or the <a href="@handbook">online Drupal handbooks</a>. You may also post at the <a href="@forum">Drupal forum</a>, or view the wide range of <a href="@support">other support options</a> available.', array('@help' => url('admin/help'), '@handbook' => 'http://drupal.org/handbooks', '@forum' => 'http://drupal.org/forum', '@support' => 'http://drupal.org/support')) . '</p>';
+ $output .= '<p>' . t('For more information, refer to the specific topics listed in the next section or to the <a href="@handbook">online Drupal handbooks</a>. You may also post at the <a href="@forum">Drupal forum</a> or view the wide range of <a href="@support">other support options</a> available.', array('@help' => url('admin/help'), '@handbook' => 'http://drupal.org/handbooks', '@forum' => 'http://drupal.org/forum', '@support' => 'http://drupal.org/support')) . '</p>';
return $output;
case 'admin/help#help':
$output = '';
diff --git a/modules/help/help.test b/modules/help/help.test
index 8e2fed968aef6af1ccb910f61c21082728b11ceb..e15bd15e7f18c383f5ab0484c03f3815d58eb38c 100644
--- a/modules/help/help.test
+++ b/modules/help/help.test
@@ -44,7 +44,7 @@ class HelpTestCase extends DrupalWebTestCase {
$this->assertRaw(drupal_get_path('module', 'help') . '/help.css', t('The help.css file is present in the HTML.'));
// Verify that introductory help text exists, goes for 100% module coverage.
- $this->assertRaw(t('For more information, please refer to the specific topics listed in the next section, or the <a href="@drupal">online Drupal handbooks</a>.', array('@drupal' => 'http://drupal.org/handbooks')), 'Help intro text correctly appears.');
+ $this->assertRaw(t('For more information, refer to the specific topics listed in the next section or to the <a href="@drupal">online Drupal handbooks</a>.', array('@drupal' => 'http://drupal.org/handbooks')), 'Help intro text correctly appears.');
// Verify that help topics text appears.
$this->assertRaw('<h2>' . t('Help topics') . '</h2><p>' . t('Help is available on the following items:') . '</p>', t('Help topics text correctly appears.'));
diff --git a/modules/image/image.module b/modules/image/image.module
index 8786d10322ccfa59e0c4a684a939140188125222..cd7cbd94b27d92826c3f7014d74c6451c14d9678 100644
--- a/modules/image/image.module
+++ b/modules/image/image.module
@@ -609,7 +609,7 @@ function image_style_generate() {
// to support Retry-After.
drupal_add_http_header('503 Service Unavailable');
drupal_add_http_header('Retry-After', 3);
- print t('Image generation in progress, please try again shortly.');
+ print t('Image generation in progress. Try again shortly.');
drupal_exit();
}
}
diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index e7c4c9fc1ec7e301cec4fd17b03e813783b3140f..869489e5f95426500c9501e4dd4265bbb37cef01 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -284,7 +284,7 @@ function node_type_form_validate($form, &$form_state) {
// 'theme' conflicts with theme_node_form().
// '0' is invalid, since elsewhere we check it using empty().
if (in_array($type->type, array('0', 'theme'))) {
- form_set_error('type', t("Invalid machine-readable name. Please enter a name other than %invalid.", array('%invalid' => $type->type)));
+ form_set_error('type', t("Invalid machine-readable name. Enter a name other than %invalid.", array('%invalid' => $type->type)));
}
}
diff --git a/modules/node/node.api.php b/modules/node/node.api.php
index 4eda704cb899daa4d5114618f7defdc387fc5deb..4deb5c8c5c15130d275d77599bd7b27b64fc14bb 100644
--- a/modules/node/node.api.php
+++ b/modules/node/node.api.php
@@ -860,7 +860,7 @@ function hook_form($node, $form_state) {
2 => 'Option B',
3 => 'Option C',
),
- '#description' => t('Please choose an option.'),
+ '#description' => t('Choose an option.'),
);
return $form;
diff --git a/modules/node/node.module b/modules/node/node.module
index 2bfa5ed8da99a25dd5b2dfdbb29b7b84cd219929..c71badf7e51e99707ee5f108593ad5b2606814b1 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -73,7 +73,7 @@ function node_help($path, $arg) {
$message = t('The content access permissions need to be rebuilt.');
}
else {
- $message = t('The content access permissions need to be rebuilt. Please visit <a href="@node_access_rebuild">this page</a>.', array('@node_access_rebuild' => url('admin/reports/status/rebuild')));
+ $message = t('The content access permissions need to be rebuilt. <a href="@node_access_rebuild">Rebuild permissions</a>.', array('@node_access_rebuild' => url('admin/reports/status/rebuild')));
}
drupal_set_message($message, 'error');
}
@@ -3155,7 +3155,7 @@ function node_assign_owner_action_form($context) {
function node_assign_owner_action_validate($form, $form_state) {
$exists = (bool) db_query_range('SELECT 1 FROM {users} WHERE name = :name', 0, 1, array(':name' => $form_state['values']['owner_name']))->fetchField();
if (!$exists) {
- form_set_error('owner_name', t('Please enter a valid username.'));
+ form_set_error('owner_name', t('Enter a valid username.'));
}
}
diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc
index 2ae471d16d5a5e179db3ac9150fa7636f1370d50..ebc40b4dc864d9d41b3ff31b1ffa45dde1b6213b 100644
--- a/modules/node/node.pages.inc
+++ b/modules/node/node.pages.inc
@@ -45,7 +45,7 @@ function theme_node_add_list($variables) {
$output .= '</dl>';
}
else {
- $output = '<p>' . t('You have not created any content types yet. Please go to the <a href="@create-content">content type creation page</a> to add a new content type.', array('@create-content' => url('admin/structure/types/add'))) . '</p>';
+ $output = '<p>' . t('You have not created any content types yet. Go to the <a href="@create-content">content type creation page</a> to add a new content type.', array('@create-content' => url('admin/structure/types/add'))) . '</p>';
}
return $output;
}
diff --git a/modules/openid/openid.install b/modules/openid/openid.install
index f9d1671aa38437039c0faa9181f1fd74ab0c51b7..c5b3b92f485fed83e894e805f1cd5faed26cfa21 100644
--- a/modules/openid/openid.install
+++ b/modules/openid/openid.install
@@ -70,7 +70,7 @@ function openid_requirements($phase) {
$requirements['bcmath'] = array(
'value' => t('Not installed'),
'severity' => REQUIREMENT_ERROR,
- 'description' => t('OpenID requires the BC Math library for PHP which is missing or outdated. Please check the <a href="@url">PHP BC Math Library documentation</a> for information on how to correct this.', array('@url' => 'http://www.php.net/manual/en/book.bc.php')),
+ 'description' => t('OpenID requires the BC Math library for PHP which is missing or outdated. Check the <a href="@url">PHP BC Math Library documentation</a> for information on how to correct this.', array('@url' => 'http://www.php.net/manual/en/book.bc.php')),
);
}
else {
diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index acf9b996ac58a90129321f583c1489c9c2971e69..69d7aae56ec4cc76dd245b3c797cf0304bdb6c46 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -183,7 +183,7 @@ function openid_begin($claimed_id, $return_to = '', $form_values = array()) {
$services = openid_discovery($claimed_id);
if (count($services) == 0) {
- form_set_error('openid_identifier', t('Sorry, that is not a valid OpenID. Please ensure you have spelled your ID correctly.'));
+ form_set_error('openid_identifier', t('Sorry, that is not a valid OpenID. Ensure you have spelled your ID correctly.'));
return;
}
@@ -448,7 +448,7 @@ function openid_authentication($response) {
$form_state['values']['response'] = $response;
if (empty($response['openid.sreg.email']) && empty($response['openid.sreg.nickname'])) {
- drupal_set_message(t('Please complete the registration by filling out the form below. If you already have an account, you can <a href="@login">log in</a> now and add your OpenID under "My account".', array('@login' => url('user/login'))), 'warning');
+ drupal_set_message(t('Complete the registration by filling out the form below. If you already have an account, you can <a href="@login">log in</a> now and add your OpenID under "My account".', array('@login' => url('user/login'))), 'warning');
$success = FALSE;
}
else {
@@ -457,7 +457,7 @@ function openid_authentication($response) {
drupal_validate_form('user_register_form', $form, $form_state);
$success = !form_get_errors();
if (!$success) {
- drupal_set_message(t('Account registration using the information provided by your OpenID provider failed due to the reasons listed below. Please complete the registration by filling out the form below. If you already have an account, you can <a href="@login">log in</a> now and add your OpenID under "My account".', array('@login' => url('user/login'))), 'warning');
+ drupal_set_message(t('Account registration using the information provided by your OpenID provider failed due to the reasons listed below. Complete the registration by filling out the form below. If you already have an account, you can <a href="@login">log in</a> now and add your OpenID under "My account".', array('@login' => url('user/login'))), 'warning');
// Append form validation errors below the above warning.
$messages = drupal_get_messages('error');
foreach ($messages['error'] as $message) {
diff --git a/modules/openid/openid.test b/modules/openid/openid.test
index bfaa1da695c04cc7693d5dc8a55600e244749bd4..84e11b99a5d9731f7bea23bb4012a9ee71d11559 100644
--- a/modules/openid/openid.test
+++ b/modules/openid/openid.test
@@ -197,7 +197,7 @@ class OpenIDFunctionalTest extends DrupalWebTestCase {
// Submit form to the OpenID Provider Endpoint.
$this->drupalPost(NULL, array(), t('Send'));
- $this->assertRaw(t('Account registration using the information provided by your OpenID provider failed due to the reasons listed below. Please complete the registration by filling out the form below. If you already have an account, you can <a href="@login">log in</a> now and add your OpenID under "My account".', array('@login' => url('user/login'))), t('User was asked to complete the registration process manually.'));
+ $this->assertRaw(t('Account registration using the information provided by your OpenID provider failed due to the reasons listed below. Complete the registration by filling out the form below. If you already have an account, you can <a href="@login">log in</a> now and add your OpenID under "My account".', array('@login' => url('user/login'))), t('User was asked to complete the registration process manually.'));
$this->assertRaw(t('The name %name is already taken.', array('%name' => $this->web_user->name)), t('Form validation error for username was displayed.'));
$this->assertRaw(t('The e-mail address %mail is not valid.', array('%mail' => 'mail@invalid#')), t('Form validation error for e-mail address was displayed.'));
@@ -241,7 +241,7 @@ class OpenIDFunctionalTest extends DrupalWebTestCase {
// Submit form to the OpenID Provider Endpoint.
$this->drupalPost(NULL, array(), t('Send'));
- $this->assertRaw(t('Please complete the registration by filling out the form below. If you already have an account, you can <a href="@login">log in</a> now and add your OpenID under "My account".', array('@login' => url('user/login'))), t('User was asked to complete the registration process manually.'));
+ $this->assertRaw(t('Complete the registration by filling out the form below. If you already have an account, you can <a href="@login">log in</a> now and add your OpenID under "My account".', array('@login' => url('user/login'))), t('User was asked to complete the registration process manually.'));
$this->assertNoRaw(t('You must enter a username.'), t('Form validation error for username was not displayed.'));
$this->assertNoRaw(t('You must enter an e-mail address.'), t('Form validation error for e-mail address was not displayed.'));
diff --git a/modules/php/php.install b/modules/php/php.install
index a9eaa8b67ccf7ea0532a7bef27b0de3aff1135fa..ca76bee505a3bfcba10adfd9e57cc423740a19d7 100644
--- a/modules/php/php.install
+++ b/modules/php/php.install
@@ -41,5 +41,5 @@ function php_enable() {
* Implements hook_disable().
*/
function php_disable() {
- drupal_set_message(t('The PHP module has been disabled. Please note that any existing content that was using the PHP filter will now be visible in plain text. This might pose a security risk by exposing sensitive information, if any, used in the PHP code.'));
+ drupal_set_message(t('The PHP module has been disabled. Any existing content that was using the PHP filter will now be visible in plain text. This might pose a security risk by exposing sensitive information, if any, used in the PHP code.'));
}
diff --git a/modules/simpletest/simpletest.install b/modules/simpletest/simpletest.install
index 31827d9e905a23dd6f5e3e4f4a8c46cefdb66e3f..055c9b2c6d5ab13d23695e21aaeaab3ad2034365 100644
--- a/modules/simpletest/simpletest.install
+++ b/modules/simpletest/simpletest.install
@@ -63,7 +63,7 @@ function simpletest_requirements($phase) {
);
if (!$has_domdocument) {
$requirements['php_domdocument']['severity'] = REQUIREMENT_ERROR;
- $requirements['php_domdocument']['description'] =t('SimpleTest requires the DOMDocument class to be available. Please check the configure command at the <a href="@link-phpinfo">PHP info page</a>.', array('@link-phpinfo' => url('admin/reports/status/php')));
+ $requirements['php_domdocument']['description'] =t('SimpleTest requires the DOMDocument class to be available. Check the configure command at the <a href="@link-phpinfo">PHP info page</a>.', array('@link-phpinfo' => url('admin/reports/status/php')));
}
// SimpleTest currently needs 2 cURL options which are incompatible with
@@ -75,7 +75,7 @@ function simpletest_requirements($phase) {
);
if ($open_basedir) {
$requirements['php_open_basedir']['severity'] = REQUIREMENT_ERROR;
- $requirements['php_open_basedir']['description'] = t('The testing framework requires the PHP <a href="@open_basedir-url">open_basedir</a> restriction to be disabled. Please check your webserver configuration or contact your web host.', array('@open_basedir-url' => 'http://php.net/manual/en/ini.core.php#ini.open-basedir'));
+ $requirements['php_open_basedir']['description'] = t('The testing framework requires the PHP <a href="@open_basedir-url">open_basedir</a> restriction to be disabled. Check your webserver configuration or contact your web host.', array('@open_basedir-url' => 'http://php.net/manual/en/ini.core.php#ini.open-basedir'));
}
return $requirements;
diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module
index b702dc06fb0fded2289ac667f700412c5f01c23c..6c50ffa1cce79453f09869dd02d03819cacb3136 100644
--- a/modules/simpletest/simpletest.module
+++ b/modules/simpletest/simpletest.module
@@ -241,7 +241,7 @@ function _simpletest_batch_finished($success, $results, $operations, $elapsed) {
drupal_set_message(t('The test run did not successfully finish.'), 'error');
- drupal_set_message(t('Please use the <em>Clean environment</em> button to clean-up temporary files and tables.'), 'warning');
+ drupal_set_message(t('Use the <em>Clean environment</em> button to clean-up temporary files and tables.'), 'warning');
}
module_invoke_all('test_group_finished');
}
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 491b2f7a8fe0c146c903521dec8c0a1b903b1b22..bcadbe7907062573c9ad16deb44afd49bd5e4503 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -1452,7 +1452,7 @@ function system_ip_blocking_form_validate($form, &$form_state) {
form_set_error('ip', t('You may not block your own IP address.'));
}
elseif (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_RES_RANGE) == FALSE) {
- form_set_error('ip', t('Please enter a valid IP address.'));
+ form_set_error('ip', t('Enter a valid IP address.'));
}
}
@@ -1659,7 +1659,7 @@ function system_performance_settings() {
$disabled = !$is_writable;
$disabled_message = '';
if(!$is_writable) {
- $disabled_message = ' ' . t('<strong class="error">Please set up the <a href="!file-system">public files directory</a> to make these optimizations available.</strong>', array('!file-system' => url('admin/config/media/file-system')));
+ $disabled_message = ' ' . t('<strong class="error">Set up the <a href="!file-system">public files directory</a> to make these optimizations available.</strong>', array('!file-system' => url('admin/config/media/file-system')));
}
$form['bandwidth_optimization'] = array(
@@ -2102,7 +2102,7 @@ function system_add_date_format_type_form_validate($form, &$form_state) {
}
$types = system_get_date_types();
if (in_array(trim($form_state['values']['machine_name']), array_keys($types))) {
- form_set_error('machine_name', t('This date type already exists. Please enter a unique type.'));
+ form_set_error('machine_name', t('This date type already exists. Enter a unique type.'));
}
}
}
@@ -2809,7 +2809,7 @@ function system_add_date_formats_form_validate($form, &$form_state) {
$formats = system_get_date_formats('custom');
$format = trim($form_state['values']['date_format']);
if (!empty($formats) && in_array($format, array_keys($formats)) && (!isset($form_state['values']['dfid']) || $form_state['values']['dfid'] != $formats[$format]['dfid'])) {
- form_set_error('date_format', t('This format already exists. Please enter a unique format string.'));
+ form_set_error('date_format', t('This format already exists. Enter a unique format string.'));
}
}
diff --git a/modules/system/system.api.php b/modules/system/system.api.php
index 9a77da9256037ce33e0474503d6a16a0281d0a54..f78556c4ce23d55406839a56a3c73241cfbf3440 100644
--- a/modules/system/system.api.php
+++ b/modules/system/system.api.php
@@ -1844,7 +1844,7 @@ function hook_requirements($phase) {
}
else {
$requirements['cron'] = array(
- 'description' => $t('Cron has not run. It appears cron jobs have not been setup on your system. Please check the help pages for <a href="@url">configuring cron jobs</a>.', array('@url' => 'http://drupal.org/cron')),
+ 'description' => $t('Cron has not run. It appears cron jobs have not been setup on your system. Check the help pages for <a href="@url">configuring cron jobs</a>.', array('@url' => 'http://drupal.org/cron')),
'severity' => REQUIREMENT_ERROR,
'value' => $t('Never run'),
);
diff --git a/modules/system/system.install b/modules/system/system.install
index a272b4142a37eb43eb9d541d4901bd2f5d813418..b9a3ae2ef4a805e95af808bed49c5bfb5f6d7bb4 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -66,7 +66,7 @@ function system_requirements($phase) {
$requirements['php'] = array(
'title' => $t('PHP'),
'value' => $phpversion,
- 'description' => $t('The phpinfo() function has been disabled for security reasons. To see your server\'s phpinfo() information, change your PHP settings or contact your server administrator. For more information, please read the <a href="@phpinfo">Enabling and disabling phpinfo()</a> handbook page.', array('@phpinfo' => 'http://drupal.org/node/243993')),
+ 'description' => $t('The phpinfo() function has been disabled for security reasons. To see your server\'s phpinfo() information, change your PHP settings or contact your server administrator. For more information, <a href="@phpinfo">Enabling and disabling phpinfo()</a> handbook page.', array('@phpinfo' => 'http://drupal.org/node/243993')),
'severity' => REQUIREMENT_INFO,
);
}
@@ -241,7 +241,7 @@ function system_requirements($phase) {
elseif ($phase == 'install') {
// For the installer UI, we need different wording. 'value' will
// be treated as version, so provide none there.
- $description = $error . $t('An automated attempt to create this directory failed, possibly due to a permissions problem. To proceed with the installation, either create the directory and modify its permissions manually, or ensure that the installer has the permissions to create it automatically. For more information, please see INSTALL.txt or the <a href="@handbook_url">online handbook</a>.', array('@handbook_url' => 'http://drupal.org/server-permissions'));
+ $description = $error . $t('An automated attempt to create this directory failed, possibly due to a permissions problem. To proceed with the installation, either create the directory and modify its permissions manually or ensure that the installer has the permissions to create it automatically. For more information, see INSTALL.txt or the <a href="@handbook_url">online handbook</a>.', array('@handbook_url' => 'http://drupal.org/server-permissions'));
$requirements['file system']['value'] = '';
}
if (!empty($description)) {
@@ -320,7 +320,7 @@ function system_requirements($phase) {
$requirements['update status'] = array(
'value' => $t('Not enabled'),
'severity' => REQUIREMENT_WARNING,
- 'description' => $t('Update notifications are not enabled. It is <strong>highly recommended</strong> that you enable the update status module from the <a href="@module">module administration page</a> in order to stay up-to-date on new releases. For more information please read the <a href="@update">Update status handbook page</a>.', array('@update' => 'http://drupal.org/handbook/modules/update', '@module' => url('admin/modules'))),
+ 'description' => $t('Update notifications are not enabled. It is <strong>highly recommended</strong> that you enable the update status module from the <a href="@module">module administration page</a> in order to stay up-to-date on new releases. For more information, <a href="@update">Update status handbook page</a>.', array('@update' => 'http://drupal.org/handbook/modules/update', '@module' => url('admin/modules'))),
);
}
else {
@@ -1986,7 +1986,7 @@ function system_update_7013() {
$timezone = 'UTC';
}
variable_set('date_default_timezone', $timezone);
- drupal_set_message('The default time zone has been set to <em>' . check_plain($timezone) . '</em>. Please check the ' . l('date and time configuration page', 'admin/config/regional/settings') . ' to configure it correctly.', 'warning');
+ drupal_set_message('The default time zone has been set to <em>' . check_plain($timezone) . '</em>. Check the ' . l('date and time configuration page', 'admin/config/regional/settings') . ' to configure it correctly.', 'warning');
}
/**
@@ -2158,7 +2158,7 @@ function system_update_7021() {
'cache' => -1,
));
}
- drupal_set_message('The contact form information setting was migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to only show on the site-wide contact page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.');
+ drupal_set_message('The contact form information setting was migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to only show on the site-wide contact page. The block was set to use the default text format, which might differ from the HTML based format used before. Check the block and ensure that the output is right.');
}
$insert->execute();
@@ -2181,7 +2181,7 @@ function system_update_7021() {
'cache' => -1,
));
}
- drupal_set_message('The user registration guidelines were migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to only show on the user registration page. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right.');
+ drupal_set_message('The user registration guidelines were migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to only show on the user registration page. The block was set to use the default text format, which might differ from the HTML based format used before. Check the block and ensure that the output is right.');
$insert->execute();
}
@@ -2204,7 +2204,7 @@ function system_update_7021() {
'cache' => -1,
));
}
- drupal_set_message('The site mission was migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to only show on the front page in the highlighted content region. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right. If your theme does not have a highlighted content region, you might need to <a href="' . url('admin/structure/block') . '">relocate the block</a>.');
+ drupal_set_message('The site mission was migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to only show on the front page in the highlighted content region. The block was set to use the default text format, which might differ from the HTML based format used before. Check the block and ensure that the output is right. If your theme does not have a highlighted content region, you might need to <a href="' . url('admin/structure/block') . '">relocate the block</a>.');
$insert->execute();
// Migrate mission to RSS site description.
variable_set('feed_description', $mission);
@@ -2230,7 +2230,7 @@ function system_update_7021() {
'cache' => -1,
));
}
- drupal_set_message('The footer message was migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to appear in the footer. The block was set to use the default text format, which might differ from the HTML based format used before. Please check the block and ensure that the output is right. If your theme does not have a footer region, you might need to <a href="' . url('admin/structure/block') . '">relocate the block</a>.');
+ drupal_set_message('The footer message was migrated to <a href="' . url('admin/structure/block/manage/block/' . $bid . '/configure') . '">a custom block</a> and set up to appear in the footer. The block was set to use the default text format, which might differ from the HTML based format used before. Check the block and ensure that the output is right. If your theme does not have a footer region, you might need to <a href="' . url('admin/structure/block') . '">relocate the block</a>.');
$insert->execute();
}
@@ -2363,7 +2363,7 @@ function system_update_7032() {
function system_update_7033() {
if (variable_get('cache') == 2) {
variable_set('cache', CACHE_NORMAL);
- return t('Aggressive caching was disabled and replaced with normal caching, please read the page caching section in default.settings.php for more information on how to enable similar functionality.');
+ return t('Aggressive caching was disabled and replaced with normal caching. Read the page caching section in default.settings.php for more information on how to enable similar functionality.');
}
}
diff --git a/modules/system/system.module b/modules/system/system.module
index 6247fcb2f10945de1159e9f68e207cf99cd0b5ed..d81246dc58de4ba21a72bd157e2010ce29b3993c 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1805,7 +1805,7 @@ function system_form_user_register_form_alter(&$form, &$form_state) {
function system_user_login(&$edit, $account) {
// If the user has a NULL time zone, notify them to set a time zone.
if (!$account->timezone && variable_get('configurable_timezones', 1) && variable_get('empty_timezone_message', 0)) {
- drupal_set_message(t('Please configure your <a href="@user-edit">account time zone setting</a>.', array('@user-edit' => url("user/$account->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
+ drupal_set_message(t('Configure your <a href="@user-edit">account time zone setting</a>.', array('@user-edit' => url("user/$account->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
}
}
@@ -1831,7 +1831,7 @@ function system_user_timezone(&$form, &$form_state) {
'#description' => t('Select the desired local time and time zone. Dates and times throughout this site will be displayed using this time zone.'),
);
if (!isset($account->timezone) && $account->uid == $user->uid && empty($form_state['input']['timezone'])) {
- $form['timezone']['#description'] = t('Your time zone setting will be automatically detected if possible. Please confirm the selection and click save.');
+ $form['timezone']['#description'] = t('Your time zone setting will be automatically detected if possible. Confirm the selection and click save.');
$form['timezone']['timezone']['#attributes'] = array('class' => array('timezone-detect'));
drupal_add_js('misc/timezone.js');
}
@@ -2832,7 +2832,7 @@ function system_send_email_action_validate($form, $form_state) {
// Validate the configuration form.
if (!valid_email_address($form_values['recipient']) && $form_values['recipient'] != '%author') {
// We want the literal %author placeholder to be emphasized in the error message.
- form_set_error('recipient', t('Please enter a valid email address or %author.', array('%author' => '%author')));
+ form_set_error('recipient', t('Enter a valid email address or %author.', array('%author' => '%author')));
}
}
diff --git a/modules/system/system.tar.inc b/modules/system/system.tar.inc
index 948a793d4bda455530418baee952757844fdf844..5f1587d701ee8c912bec9dfd895bad4091068fc6 100644
--- a/modules/system/system.tar.inc
+++ b/modules/system/system.tar.inc
@@ -154,7 +154,7 @@ function __construct($p_tarname, $p_compress = null)
}
if (!extension_loaded($extname)) {
die("The extension '$extname' couldn't be found.\n".
- "Please make sure your version of PHP was built ".
+ "Make sure your version of PHP was built ".
"with '$extname' support.\n");
return false;
}
diff --git a/modules/system/system.test b/modules/system/system.test
index 4626fa4e01dc6a97742b88e56ad03ca1a1c5b2ca..03545ce943cd6557ccf4b1a6575a165aa30e8e68 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -358,19 +358,19 @@ class IPAddressBlockingTestCase extends DrupalWebTestCase {
$edit = array();
$edit['ip'] = '255.255.255.255';
$this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save'));
- $this->assertText(t('Please enter a valid IP address.'));
+ $this->assertText(t('Enter a valid IP address.'));
// Try to block a reserved IP address.
$edit = array();
$edit['ip'] = 'test.example.com';
$this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save'));
- $this->assertText(t('Please enter a valid IP address.'));
+ $this->assertText(t('Enter a valid IP address.'));
// Submit an empty form.
$edit = array();
$edit['ip'] = '';
$this->drupalPost('admin/config/people/ip-blocking', $edit, t('Save'));
- $this->assertText(t('Please enter a valid IP address.'));
+ $this->assertText(t('Enter a valid IP address.'));
// Submit your own IP address. This fails, although it works when testing manually.
// TODO: on some systems this test fails due to a bug or inconsistency in cURL.
diff --git a/modules/update/update.manager.inc b/modules/update/update.manager.inc
index ab8eade28b0928ea2466ade183b1d5a94193f37d..5e80d69535c62c0a16dc113aeb4215f4bff3c18c 100644
--- a/modules/update/update.manager.inc
+++ b/modules/update/update.manager.inc
@@ -61,7 +61,7 @@ function update_manager_update_form($form, $form_state = array(), $context) {
$available = update_get_available(TRUE);
if (empty($available)) {
$form['message'] = array(
- '#markup' => t('There was a problem getting update information. Please try again later.'),
+ '#markup' => t('There was a problem getting update information. Try again later.'),
);
return $form;
}
diff --git a/modules/update/update.module b/modules/update/update.module
index 347f66e592281bdc0ec0e0a863afa32046aace3c..a961c20870ae5fa264da81c13351cf432482af88 100644
--- a/modules/update/update.module
+++ b/modules/update/update.module
@@ -499,10 +499,10 @@ function update_mail($key, &$message, $params) {
}
$settings_url = url('admin/reports/updates/settings', array('absolute' => TRUE));
if (variable_get('update_notification_threshold', 'all') == 'all') {
- $message['body'][] = t('Your site is currently configured to send these emails when any updates are available. To get notified only for security updates, please visit !url.', array('!url' => $settings_url));
+ $message['body'][] = t('Your site is currently configured to send these emails when any updates are available. To get notified only for security updates, !url.', array('!url' => $settings_url));
}
else {
- $message['body'][] = t('Your site is currently configured to send these emails only when security updates are available. To get notified for any available updates, please visit !url.', array('!url' => $settings_url));
+ $message['body'][] = t('Your site is currently configured to send these emails only when security updates are available. To get notified for any available updates, !url.', array('!url' => $settings_url));
}
}
@@ -553,7 +553,7 @@ function _update_message_text($msg_type, $msg_reason, $report_link = FALSE, $lan
$text = t('Your version of Drupal is no longer supported. Upgrading is strongly recommended!', array(), array('langcode' => $langcode));
}
else {
- $text = t('The installed version of at least one of your modules or themes is no longer supported. Upgrading or disabling is strongly recommended! Please see the project homepage for more details.', array(), array('langcode' => $langcode));
+ $text = t('The installed version of at least one of your modules or themes is no longer supported. Upgrading or disabling is strongly recommended. See the project homepage for more details.', array(), array('langcode' => $langcode));
}
break;
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index a607c900674e56f6aa3766306ceef503e9888492..07c775d78922740248461f2f7cb925bc3fb21a10 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -825,12 +825,12 @@ function user_admin_role_validate($form, &$form_state) {
if ($form_state['values']['op'] == t('Save role')) {
$role = user_role_load($form_state['values']['name']);
if ($role && $role->rid != $form_state['values']['rid']) {
- form_set_error('name', t('The role name %name already exists. Please choose another role name.', array('%name' => $form_state['values']['name'])));
+ form_set_error('name', t('The role name %name already exists. Choose another role name.', array('%name' => $form_state['values']['name'])));
}
}
elseif ($form_state['values']['op'] == t('Add role')) {
if (user_role_load($form_state['values']['name'])) {
- form_set_error('name', t('The role name %name already exists. Please choose another role name.', array('%name' => $form_state['values']['name'])));
+ form_set_error('name', t('The role name %name already exists. Choose another role name.', array('%name' => $form_state['values']['name'])));
}
}
}
diff --git a/modules/user/user.api.php b/modules/user/user.api.php
index 481002b41d7166cad5a027d8b5ee91c1a8322031..e7e69c7ae06397b7047a76266f53914cd777305e 100644
--- a/modules/user/user.api.php
+++ b/modules/user/user.api.php
@@ -287,7 +287,7 @@ function hook_user_update(&$edit, $account, $category) {
function hook_user_login(&$edit, $account) {
// If the user has a NULL time zone, notify them to set a time zone.
if (!$user->timezone && variable_get('configurable_timezones', 1) && variable_get('empty_timezone_message', 0)) {
- drupal_set_message(t('Please configure your <a href="@user-edit">account time zone setting</a>.', array('@user-edit' => url("user/$user->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
+ drupal_set_message(t('Configure your <a href="@user-edit">account time zone setting</a>.', array('@user-edit' => url("user/$user->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
}
}
diff --git a/modules/user/user.module b/modules/user/user.module
index 41f83d945d04d47c96f0aa99d54059f8db4f671c..745d4abd18ccb03c55b36b3926347d465186365d 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1842,11 +1842,11 @@ function user_login_final_validate($form, &$form_state) {
if (isset($form_state['flood_control_triggered'])) {
if ($form_state['flood_control_triggered'] == 'user') {
- form_set_error('name', format_plural(variable_get('user_failed_login_user_limit', 5), 'Sorry, there has been more than one failed login attempt for this account. It is temporarily blocked. Please try again later, or <a href="@url">request a new password</a>.', 'Sorry, there have been more than @count failed login attempts for this account. It is temporarily blocked. Please try again later, or <a href="@url">request a new password</a>.', array('@url' => url('user/password'))));
+ form_set_error('name', format_plural(variable_get('user_failed_login_user_limit', 5), 'Sorry, there has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or <a href="@url">request a new password</a>.', 'Sorry, there have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or <a href="@url">request a new password</a>.', array('@url' => url('user/password'))));
}
else {
// We did not find a uid, so the limit is IP-based.
- form_set_error('name', t('Sorry, too many failed login attempts from your IP address. This IP address is temporarily blocked. Please try again later, or <a href="@url">request a new password</a>.', array('@url' => url('user/password'))));
+ form_set_error('name', t('Sorry, too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or <a href="@url">request a new password</a>.', array('@url' => url('user/password'))));
}
}
else {
diff --git a/modules/user/user.test b/modules/user/user.test
index 65408397d57debecb0aad44dda80634879489c1c..e790c3ad7035325a1d7aae3d146b0a68e67f9efe 100644
--- a/modules/user/user.test
+++ b/modules/user/user.test
@@ -289,11 +289,11 @@ class UserLoginTestCase extends DrupalWebTestCase {
$this->drupalPost('user', $edit, t('Log in'));
if (isset($flood_trigger)) {
if ($flood_trigger == 'user') {
- $this->assertRaw(format_plural(variable_get('user_failed_login_user_limit', 5), 'Sorry, there has been more than one failed login attempt for this account. It is temporarily blocked. Please try again later, or <a href="@url">request a new password</a>.', 'Sorry, there have been more than @count failed login attempts for this account. It is temporarily blocked. Please try again later, or <a href="@url">request a new password</a>.', array('@url' => url('user/password'))));
+ $this->assertRaw(format_plural(variable_get('user_failed_login_user_limit', 5), 'Sorry, there has been more than one failed login attempt for this account. It is temporarily blocked. Try again later or <a href="@url">request a new password</a>.', 'Sorry, there have been more than @count failed login attempts for this account. It is temporarily blocked. Try again later or <a href="@url">request a new password</a>.', array('@url' => url('user/password'))));
}
else {
// No uid, so the limit is IP-based.
- $this->assertRaw(t('Sorry, too many failed login attempts from your IP address. This IP address is temporarily blocked. Please try again later, or <a href="@url">request a new password</a>.', array('@url' => url('user/password'))));
+ $this->assertRaw(t('Sorry, too many failed login attempts from your IP address. This IP address is temporarily blocked. Try again later or <a href="@url">request a new password</a>.', array('@url' => url('user/password'))));
}
}
else {
diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
index 43e08a1a1711ef85b33fdeb2cb37a52358dea4cf..068ffffefb0acbd57b0a75054f085d22e316d66c 100755
--- a/scripts/run-tests.sh
+++ b/scripts/run-tests.sh
@@ -226,7 +226,7 @@ function simpletest_script_parse_args() {
exit;
}
elseif ($args['concurrency'] > 1 && !function_exists('pcntl_fork')) {
- simpletest_script_print_error("Parallel test execution requires the Process Control extension to be compiled in PHP. Please see http://php.net/manual/en/intro.pcntl.php for more information.");
+ simpletest_script_print_error("Parallel test execution requires the Process Control extension to be compiled in PHP. See http://php.net/manual/en/intro.pcntl.php for more information.");
exit;
}
@@ -255,7 +255,7 @@ function simpletest_script_init($server_software) {
list($php, ) = explode(' ', $_ENV['SUDO_COMMAND'], 2);
}
else {
- simpletest_script_print_error('Unable to automatically determine the path to the PHP interpreter. Please supply the --php command line argument.');
+ simpletest_script_print_error('Unable to automatically determine the path to the PHP interpreter. Supply the --php command line argument.');
simpletest_script_help();
exit();
}