? 163246.patch Index: modules/system/system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.19 diff -u -p -r1.19 system.admin.inc --- modules/system/system.admin.inc 31 Oct 2007 18:01:01 -0000 1.19 +++ modules/system/system.admin.inc 31 Oct 2007 23:04:19 -0000 @@ -443,7 +443,7 @@ function system_theme_settings(&$form_st $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', @@ -1226,7 +1226,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', @@ -1234,7 +1234,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['reverse_proxy'] = array( @@ -1663,9 +1663,9 @@ function system_sql() { $output .= '

'. 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.') .'

'; $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; @@ -1782,10 +1782,10 @@ function theme_admin_page($blocks) { $output = '
'; $output .= '
'; 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 descroptions.'))); } $output .= '
'; Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.547 diff -u -p -r1.547 system.module --- modules/system/system.module 27 Oct 2007 11:32:05 -0000 1.547 +++ modules/system/system.module 31 Oct 2007 23:04:19 -0000 @@ -35,7 +35,7 @@ function system_help($path, $arg) { case 'admin/by-module': return '

'. t('This page shows you all available administration tasks for each module.') .'

'; case 'admin/build/themes': - return '

'. 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. Alternately, 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.') .'

'; + return '

'. 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.') .'

'; case 'admin/build/themes/settings/'. $arg[4]: $reference = explode('.', $arg[4], 2); $theme = array_pop($reference); @@ -43,7 +43,7 @@ function system_help($path, $arg) { case 'admin/build/themes/settings': return '

'. 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.') .'

'; case 'admin/build/modules': - $output = '

'. 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 permissions 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 = '

'. 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 permissions might be made available. To reduce server load, modules with their Throttle checkbox selected are temporarily disabled when your site becomes extremely busy. (Note that the Throttle 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 throttle configuration page after having enabled the throttle module.', array('@throttle' => url('admin/settings/throttle'))); } @@ -67,7 +67,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 Description 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 '

'. 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.") .'

'; + return '

'. t("Here you can find a short overview of your Drupal 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.") .'

'; } }