'. t('For more information, please read the configuration and customization handbook page for the contact module.', array('@contact' => url('http://drupal.org/handbook/modules/contact/', array('absolute' => TRUE)))) .'
'; return $output; case 'admin/build/contact': - $output = ''. t('This page lets you setup your site-wide contact form. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the settings page, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact/settings'), '@form' => url('contact'))) .'
'; + $output = ''. t('This page lets you set up your site-wide contact form. To do so, add one or more categories. You can associate different recipients with each category to route e-mails to different people. For example, you can route website feedback to the webmaster and direct product information requests to the sales department. On the settings page, you can customize the information shown above the contact form. This can be useful to provide additional contact information such as your postal address and telephone number.', array('@settings' => url('admin/build/contact/settings'), '@form' => url('contact'))) .'
'; if (!module_exists('menu')) { $menu_note = t('The menu item can be customized and configured only once the menu module has been enabled.', array('@modules-page' => url('admin/settings/modules'))); } Index: modules/system/system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.25 diff -u -p -r1.25 system.admin.inc --- modules/system/system.admin.inc 23 Nov 2007 15:36:44 -0000 1.25 +++ modules/system/system.admin.inc 24 Nov 2007 15:14:46 -0000 @@ -448,7 +448,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', @@ -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['reverse_proxy'] = array( @@ -1675,9 +1675,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; @@ -1794,10 +1794,10 @@ function theme_admin_page($blocks) { $output = ''. 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 that extend Drupal\'s core functionality. Enable modules by selecting the Enabled checkboxes below and clicking the Save configuration button. Once a module is enabled, new permissions may be 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'))); } @@ -68,7 +68,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 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.") .'
'; } } Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.866 diff -u -p -r1.866 user.module --- modules/user/user.module 20 Nov 2007 13:44:38 -0000 1.866 +++ modules/user/user.module 24 Nov 2007 15:14:46 -0000 @@ -1171,7 +1171,7 @@ function user_login(&$form_state, $msg = } /** - * Setup a series for validators which check for blocked/denied users, + * Set up a series for validators which check for blocked/denied users, * then authenticate against local database, then return an error if * authentication fails. Distributed authentication modules (e.g. * drupal.module) are welcome to use hook_form_alter() to change this @@ -1706,7 +1706,7 @@ function user_help($path, $arg) { switch ($path) { case 'admin/help#user': - $output = ''. t('The user module allows users to register, login, and log out. Users benefit from being able to sign on because it associates content they create with their account and allows various permissions to be set for their roles. The user module supports user roles which can setup fine grained permissions allowing each role to do only what the administrator wants them to. Each user is assigned to one or more roles. By default there are two roles anonymous - a user who has not logged in, and authenticated a user who has signed up and who has been authorized.') .'
'; + $output = ''. t('The user module allows users to register, login, and log out. Users benefit from being able to sign on because it associates content they create with their account and allows various permissions to be set for their roles. The user module supports user roles which establish fine grained permissions allowing each role to do only what the administrator wants them to. Each user is assigned to one or more roles. By default there are two roles anonymous - a user who has not logged in, and authenticated a user who has signed up and who has been authorized.') .'
'; $output .= ''. t('Users can use their own name or handle and can fine tune some personal configuration settings through their individual my account page. Registered users need to authenticate by supplying either a local username and password, or a remote username and password such as DelphiForums ID, or one from a Drupal powered website. A visitor accessing your website is assigned an unique ID, the so-called session ID, which is stored in a cookie. For security\'s sake, the cookie does not contain personal information but acts as a key to retrieve the information stored on your server.') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook User page.', array('@user' => 'http://drupal.org/handbook/modules/user/')) .'
'; return $output;