diff options
Diffstat (limited to 'modules/system')
| -rw-r--r-- | modules/system/system.admin.inc | 20 | ||||
| -rw-r--r-- | modules/system/system.install | 18 | ||||
| -rw-r--r-- | modules/system/system.module | 8 |
3 files changed, 23 insertions, 23 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 230183aae..ce139cde6 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -448,7 +448,7 @@ function system_theme_settings(&$form_state, $key = '') { $form['favicon'] = array( '#type' => 'fieldset', '#title' => t('Shortcut icon settings'), - '#description' => t("Your shortcut icon or 'favicon' is displayed in the address bar and bookmarks of most browsers.") + '#description' => t("Your shortcut icon, or 'favicon', is displayed in the address bar and bookmarks of most browsers.") ); $form['favicon']['default_favicon'] = array( '#type' => 'checkbox', @@ -1072,7 +1072,7 @@ function system_site_information_settings() { '#type' => 'textfield', '#title' => t('E-mail address'), '#default_value' => variable_get('site_mail', ini_get('sendmail_from')), - '#description' => t('A valid e-mail address to be used as the "From" address by the auto-mailer during registration, new password requests, notifications, etc. To lessen the likelihood of e-mail being marked as spam, this e-mail address should use the same domain as the website.'), + '#description' => t('A valid e-mail address to be used as the "From" address by the auto-mailer during registration, new password requests, notifications, etc. To lessen the likelihood of e-mail being marked as spam, this e-mail address should use the same domain as the website.'), '#required' => TRUE, ); $form['site_slogan'] = array( @@ -1238,7 +1238,7 @@ function system_performance_settings() { '#default_value' => variable_get('preprocess_css', 0) && $is_writable, '#disabled' => !$is_writable, '#options' => array(t('Disabled'), t('Enabled')), - '#description' => t("This option can interfere with theme development. It is recommended to only turn this on when your site is complete."), + '#description' => t('This option can interfere with theme development and should only be enabled in a production environment.'), ); $form['bandwidth_optimizations']['preprocess_js'] = array( '#type' => 'radios', @@ -1246,7 +1246,7 @@ function system_performance_settings() { '#default_value' => variable_get('preprocess_js', 0) && $is_writable, '#disabled' => !$is_writable, '#options' => array(t('Disabled'), t('Enabled')), - '#description' => t("This option can interfere with module development. It is recommended to only turn this on when your site is complete."), + '#description' => t('This option can interfere with module development and should only be enabled in a production environment.'), ); $form['clear_cache'] = array( @@ -1678,12 +1678,12 @@ function system_sql() { )); $output .= '<h2>'. t('Query cache information') .'</h2>'; - $output .= '<p>'. t('The MySQL query cache can improve performance of your site by storing the result of queries. Then, if an identical query is received later, the MySQL server retrieves the result from the query cache rather than parsing and executing the statement again.') .'</p>'; + $output .= '<p>'. t('The MySQL query cache can improve performance of your site by storing the result of queries. Then, if an identical query is received later, the MySQL server retrieves the result from the query cache rather than parsing and executing the statement again.') .'</p>'; $output .= _system_sql($data, array( 'Qcache_queries_in_cache' => t('The number of queries in the query cache.'), - 'Qcache_hits' => t('The number of times that MySQL found previous results in the cache.'), - 'Qcache_inserts' => t('The number of times that MySQL added a query to the cache (misses).'), - 'Qcache_lowmem_prunes' => t('The number of times that MySQL had to remove queries from the cache because it ran out of memory. Ideally should be zero.') + 'Qcache_hits' => t('The number of times MySQL found previous results in the cache.'), + 'Qcache_inserts' => t('The number of times MySQL added a query to the cache (misses).'), + 'Qcache_lowmem_prunes' => t('The number of times MySQL had to remove queries from the cache because it ran out of memory. Ideally should be zero.') )); return $output; @@ -1800,10 +1800,10 @@ function theme_admin_page($blocks) { $output = '<div class="admin clear-block">'; $output .= '<div class="compact-link">'; if (system_admin_compact_mode()) { - $output .= l(t('Show descriptions'), 'admin/compact/off', array('title' => t('Produce a less compact layout that includes descriptions.'))); + $output .= l(t('Show descriptions'), 'admin/compact/off', array('title' => t('Expand layout to include descriptions.'))); } else { - $output .= l(t('Hide descriptions'), 'admin/compact/on', array('title' => t("Produce a more compact layout that doesn't include descriptions."))); + $output .= l(t('Hide descriptions'), 'admin/compact/on', array('title' => t('Compress layout by hiding descriptions.'))); } $output .= '</div>'; diff --git a/modules/system/system.install b/modules/system/system.install index c489eb862..1f036b28f 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -362,7 +362,7 @@ function system_schema() { // some database drivers, e.g. Oracle and DB2, will require variable_get() // and variable_set() for overcoming some database specific limitations. $schema['variable'] = array( - 'description' => t('Named variable/value pairs created by Drupal core or any other module or theme. All variables are cached in memory at the start of every Drupal request so developers should not be careless about what is stored here.'), + 'description' => t('Named variable/value pairs created by Drupal core or any other module or theme. All variables are cached in memory at the start of every Drupal request so developers should not be careless about what is stored here.'), 'fields' => array( 'name' => array( 'description' => t('The name of the variable.'), @@ -666,7 +666,7 @@ function system_schema() { 'not null' => TRUE, 'default' => ''), 'tab_root' => array( - 'description' => t('Router path of the closest non-tab parent page. For pages that are not local tasks, this will be the same as the path.'), + 'description' => t('Router path of the closest non-tab parent page. For pages that are not local tasks, this will be the same as the path.'), 'type' => 'varchar', 'length' => 255, 'not null' => TRUE, @@ -684,7 +684,7 @@ function system_schema() { 'not null' => TRUE, 'default' => ''), 'title_arguments' => array( - 'description' => t('A serialized array of arguments for the title callback. If empty, the title will be used as the sole argument for the title callback.'), + 'description' => t('A serialized array of arguments for the title callback. If empty, the title will be used as the sole argument for the title callback.'), 'type' => 'varchar', 'length' => 255, 'not null' => TRUE, @@ -817,7 +817,7 @@ function system_schema() { 'default' => 0, 'size' => 'small'), 'p1' => array( - 'description' => t('The first mlid in the materialized path. If N = depth, then pN must equal the mlid. If depth > 1 then p(N-1) must equal the plid. All pX where X > depth must equal zero. The columns p1 .. p9 are also called the parents.'), + 'description' => t('The first mlid in the materialized path. If N = depth, then pN must equal the mlid. If depth > 1 then p(N-1) must equal the plid. All pX where X > depth must equal zero. The columns p1 .. p9 are also called the parents.'), 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, @@ -919,7 +919,7 @@ function system_schema() { 'not null' => TRUE, 'default' => 0), 'session' => array( - 'description' => t('The serialized contents of $_SESSION, an array of name/value pairs that persists across page requests by this session ID. Drupal loads $_SESSION from here at the start of each request and saves it at the end.'), + 'description' => t('The serialized contents of $_SESSION, an array of name/value pairs that persists across page requests by this session ID. Drupal loads $_SESSION from here at the start of each request and saves it at the end.'), 'type' => 'text', 'not null' => FALSE, 'size' => 'big') @@ -975,13 +975,13 @@ function system_schema() { 'not null' => TRUE, 'default' => 0), 'schema_version' => array( - 'description' => t("The module's database schema version number. -1 if the module is not installed (its tables do not exist); 0 or the largest N of the module's hook_update_N() function that has either been run or existed when the module was first installed."), + 'description' => t("The module's database schema version number. -1 if the module is not installed (its tables do not exist); 0 or the largest N of the module's hook_update_N() function that has either been run or existed when the module was first installed."), 'type' => 'int', 'not null' => TRUE, 'default' => -1, 'size' => 'small'), 'weight' => array( - 'description' => t("The order in which this module's hooks should be invoked relative to other modules. Equal-weighted modules are ordered by name."), + 'description' => t("The order in which this module's hooks should be invoked relative to other modules. Equal-weighted modules are ordered by name."), 'type' => 'int', 'not null' => TRUE, 'default' => 0), @@ -1019,7 +1019,7 @@ function system_schema() { 'not null' => TRUE, 'default' => ''), 'language' => array( - 'description' => t('The language this alias is for; if blank, the alias will be used for unknown languages. Each Drupal path can have an alias for each supported language.'), + 'description' => t('The language this alias is for; if blank, the alias will be used for unknown languages. Each Drupal path can have an alias for each supported language.'), 'type' => 'varchar', 'length' => 12, 'not null' => TRUE, @@ -1969,7 +1969,7 @@ function system_update_6017() { $ret[] = array('success' => TRUE, 'query' => "variable_set($new_name)"); $ret[] = array('success' => TRUE, 'query' => "variable_del($old_name)"); if ($old_name == 'user_mail_approval_body') { - drupal_set_message(t('Saving an old value of the welcome message body for users that are pending administrator approval. However, you should consider modifying this text, since Drupal can now be configured to automatically notify users and send them their login information when their accounts are approved. See the !admin_user_settings page for details.', array('!admin_user_settings' => l(t('User settings'), 'admin/user/settings')))); + drupal_set_message(t('Saving an old value of the welcome message body for users that are pending administrator approval. However, you should consider modifying this text, since Drupal can now be configured to automatically notify users and send them their login information when their accounts are approved. See the !admin_user_settings page for details.', array('!admin_user_settings' => l(t('User settings'), 'admin/user/settings')))); } } } diff --git a/modules/system/system.module b/modules/system/system.module index 8d83f361a..d6997c2f1 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -35,7 +35,7 @@ function system_help($path, $arg) { case 'admin/by-module': return '<p>'. t('This page shows you all available administration tasks for each module.') .'</p>'; case 'admin/build/themes': - $output = '<p>'. t('Select which themes are available to your users and specify the default theme. To configure site-wide display settings, click the "configure" task above. Alternatively, to override these settings in a specific theme, click the "configure" link for the corresponding theme. Note that different themes may have different regions available for rendering content like blocks. If you want consistency in what your users see, you may wish to enable only one theme.') .'</p>'; + $output = '<p>'. t('Select which themes are available to your users and specify the default theme. To configure site-wide display settings, click the "configure" task above. Alternatively, to override these settings in a specific theme, click the "configure" link for that theme. Note that different themes may have different regions available for displaying content; for consistency in presentation, you may wish to enable only one theme.') .'</p>'; $output .= '<p>'. t('To change the appearance of your site, a number of <a href="@themes">contributed themes</a> are available.', array('@themes' => 'http://drupal.org/project/themes')) .'</p>'; return $output; case 'admin/build/themes/settings/'. $arg[4]: @@ -45,7 +45,7 @@ function system_help($path, $arg) { case 'admin/build/themes/settings': return '<p>'. t('These options control the default display settings for your entire site, across all themes. Unless they have been overridden by a specific theme, these settings will be used.') .'</p>'; case 'admin/build/modules': - $output = '<p>'. t('Modules are plugins for Drupal that extend its core functionality. Here you can select which modules are enabled. Once a module is enabled, new <a href="@permissions">permissions</a> might be made available. Modules can automatically be temporarily disabled to reduce server load when your site becomes extremely busy by enabling the throttle.module and checking throttle.', array('@permissions' => url('admin/user/permissions'))); + $output = '<p>'. t('Modules are plugins that extend Drupal\'s core functionality. Enable modules by selecting the <em>Enabled</em> checkboxes below and clicking the <em>Save configuration</em> button. Once a module is enabled, new <a href="@permissions">permissions</a> may be available. To reduce server load, modules with their <em>Throttle</em> checkbox selected are temporarily disabled when your site becomes extremely busy. (Note that the <em>Throttle</em> checkbox is only available if the Throttle module is enabled.)', array('@permissions' => url('admin/user/permissions'))); if (module_exists('throttle')) { $output .= ' '. t('The auto-throttle functionality must be enabled on the <a href="@throttle">throttle configuration page</a> after having enabled the throttle module.', array('@throttle' => url('admin/settings/throttle'))); } @@ -72,7 +72,7 @@ function system_help($path, $arg) { case 'admin/settings/actions/configure': return t('An advanced action offers additional configuration options which may be filled out below. Changing the <em>Description</em> field is recommended, in order to better identify the precise action taking place. This description will be displayed in modules such as the trigger module when assigning actions to system events, so it is best if it is as descriptive as possible (for example, "Send e-mail to Moderation Team" rather than simply "Send e-mail").'); case 'admin/reports/status': - return '<p>'. t("Here you can find a short overview of your Drupal site's parameters as well as any problems detected with your installation. It is useful to copy/paste this information when you need support.") .'</p>'; + return '<p>'. t("Here you can find a short overview of your site's parameters as well as any problems detected with your installation. It may be useful to copy and paste this information into support requests filed on drupal.org's support forums and project issue queues.") .'</p>'; } } @@ -1597,7 +1597,7 @@ function system_message_action_form($context) { '#default_value' => isset($context['message']) ? $context['message'] : '', '#required' => TRUE, '#rows' => '8', - '#description' => t('The message to be displayed to the current user. You may include the following variables: %site_name, %username, %node_url, %node_type, %title, %teaser, %body. Not all variables will be available in all contexts.'), + '#description' => t('The message to be displayed to the current user. You may include the following variables: %site_name, %username, %node_url, %node_type, %title, %teaser, %body. Not all variables will be available in all contexts.'), ); return $form; } |