diff options
| -rw-r--r-- | modules/system/system.admin.inc | 2 | ||||
| -rw-r--r-- | modules/system/system.install | 2 | ||||
| -rw-r--r-- | modules/translation/translation.module | 2 | ||||
| -rw-r--r-- | modules/user/user.module | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 94f1e62cf..4b20d76c1 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1656,7 +1656,7 @@ function system_performance_settings() { $form['bandwidth_optimization'] = array( '#type' => 'fieldset', '#title' => t('Bandwidth optimization'), - '#description' => t('External resources can be optimized automatically, which can reduce both the size and number of requests made to your website.') . $disabled_message, + '#description' => t('External resources can be optimized automatically, which can reduce both the size and number of requests made to your website.') . $disabled_message, ); $js_hide = $cache == CACHE_DISABLED ? ' class="js-hide"' : ''; diff --git a/modules/system/system.install b/modules/system/system.install index f4a7898a1..a3766e22c 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -379,7 +379,7 @@ function system_requirements($phase) { 'title' => $t('HTTP request status'), 'value' => $t('Fails'), 'severity' => REQUIREMENT_ERROR, - 'description' => $t('Your system or network configuration does not allow Drupal to access web pages, resulting in reduced functionality. This could be due to your webserver configuration or PHP settings, and should be resolved in order to download information about available updates, fetch aggregator feeds, sign in via OpenID, or use other network-dependent services. If you are certain that Drupal can access web pages but you are still seeing this message, you may add <code>$conf[\'drupal_http_request_fails\'] = FALSE;</code> to the bottom of your settings.php file.'), + 'description' => $t('Your system or network configuration does not allow Drupal to access web pages, resulting in reduced functionality. This could be due to your webserver configuration or PHP settings, and should be resolved in order to download information about available updates, fetch aggregator feeds, sign in via OpenID, or use other network-dependent services. If you are certain that Drupal can access web pages but you are still seeing this message, you may add <code>$conf[\'drupal_http_request_fails\'] = FALSE;</code> to the bottom of your settings.php file.'), ); } } diff --git a/modules/translation/translation.module b/modules/translation/translation.module index 436cdc2d9..c9f709b02 100644 --- a/modules/translation/translation.module +++ b/modules/translation/translation.module @@ -229,7 +229,7 @@ function translation_node_prepare($node) { if (!empty($source_node->tnid)) { $translations = translation_node_get_translations($source_node->tnid); if (isset($translations[$_GET['language']])) { - drupal_set_message(t('A translation of %title in %language already exists, a new %type will be created instead of a translation.', array('%title' => $source_node->title, '%language' => $language_list[$_GET['language']]->name, '%type' => $node->type)), 'error'); + drupal_set_message(t('A translation of %title in %language already exists, a new %type will be created instead of a translation.', array('%title' => $source_node->title, '%language' => $language_list[$_GET['language']]->name, '%type' => $node->type)), 'error'); return; } } diff --git a/modules/user/user.module b/modules/user/user.module index fa74dd647..2aa246e3b 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -40,7 +40,7 @@ function user_help($path, $arg) { case 'admin/people/create': return '<p>' . t("This web page allows administrators to register new users. Users' e-mail addresses and usernames must be unique.") . '</p>'; case 'admin/people/permissions': - return '<p>' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the <a href="@role">Roles</a> page to create a role). Two important roles to consider are Authenticated Users and Administrators. Any permissions granted to the Authenticated Users role will be given to any user who can log into your site. You can make any role the Administrator role for the site, meaning this will be granted all new permissions automatically. You can do this on the <a href="@settings">User Settings</a> page. You should be careful to ensure that only trusted users are given this access and level of control of your site.', array('@role' => url('admin/people/permissions/roles'), '@settings' => url('admin/config/people/accounts'))) . '</p>'; + return '<p>' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the <a href="@role">Roles</a> page to create a role). Two important roles to consider are Authenticated Users and Administrators. Any permissions granted to the Authenticated Users role will be given to any user who can log into your site. You can make any role the Administrator role for the site, meaning this will be granted all new permissions automatically. You can do this on the <a href="@settings">User Settings</a> page. You should be careful to ensure that only trusted users are given this access and level of control of your site.', array('@role' => url('admin/people/permissions/roles'), '@settings' => url('admin/config/people/accounts'))) . '</p>'; case 'admin/people/permissions/roles': $output = '<p>' . t('Roles allow you to fine tune the security and administration of Drupal. A role defines a group of users that have certain privileges as defined on the <a href="@permissions">permissions page</a>. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the names and order of the roles on your site. It is recommended to order your roles from least permissive (anonymous user) to most permissive (administrator). To delete a role choose "edit role".', array('@permissions' => url('admin/people/permissions'))) . '</p>'; $output .= '<p>'. t('By default, Drupal comes with two user roles:') . '</p>'; |