diff --git a/includes/common.inc b/includes/common.inc
index cf296fddbcf003e77fd18b0d863f64da779006f3..e516f86b564e444ecb9bf5b531284db68cae33f4 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -313,7 +313,7 @@ function drupal_site_offline() {
drupal_set_header('HTTP/1.0 503 Service unavailable');
drupal_set_title(t('Site off-line'));
print theme('maintenance_page', filter_xss_admin(variable_get('site_offline_message',
- t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', t('This Drupal site')))))));
+ t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal'))))));
}
/**
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index ccaf7909b15af8182a5046269e29536eb4cd8db0..e8396558d4f8b2b15671ce476533cb63f19cbabf 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -1212,7 +1212,7 @@ function aggregator_page_rss() {
$output .= "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
$output .= "<rss version=\"2.0\">\n";
- $output .= format_rss_channel(variable_get('site_name', t('Drupal')) . ' ' . t('aggregator'), url('aggregator' . $url, NULL, NULL, TRUE), variable_get('site_name', t('Drupal')) . ' - ' . t('aggregated feeds') . $title, $items, 'en');
+ $output .= format_rss_channel(variable_get('site_name', 'Drupal') . ' ' . t('aggregator'), url('aggregator' . $url, NULL, NULL, TRUE), variable_get('site_name', 'Drupal') . ' - ' . t('aggregated feeds') . $title, $items, 'en');
$output .= "</rss>\n";
drupal_set_header('Content-Type: application/rss+xml; charset=utf-8');
diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module
index f41119abbde0d3629b847e85f7cd63b508b9cab1..dbc6529b1717b8fcb64ea731bf3fbe390de52576 100644
--- a/modules/drupal/drupal.module
+++ b/modules/drupal/drupal.module
@@ -41,7 +41,7 @@ function drupal_help($section) {
return t('<p>Using this your site can "call home" to another Drupal server. By calling home to drupal.org and sending a list of your installed modules and themes, you help rank projects on drupal.org and so assist all Drupal administrators to find the best components for meeting their needs. If you want to register with a different server, you can change the Drupal XML-RPC server setting -- but the server has to be able to handle Drupal XML. Some XML-RPC servers may present directories of all registered sites. To get all your site information listed, go to the <a href="@site-settings">site information settings page</a> and set the site name, the e-mail address, the slogan, and the mission statement.</p>', array('@site-settings' => url('admin/settings/site-information')));
case 'user/help#drupal':
return variable_get('drupal_authentication_service', 0) ? t('<p><a href="@Drupal">Drupal</a> is the name of the software that powers %this-site. There are Drupal websites all over the world, and many of them share their registration databases so that users may freely log in to any Drupal site using a single <strong>Drupal ID</strong>.</p>
-<p>So please feel free to log in to your account here at %this-site with a username from another Drupal site. The format of a Drupal ID is similar to an e-mail address: <strong>username</strong>@<em>server</em>. An example of a valid Drupal ID is <strong>mwlily</strong>@<em>drupal.org</em>.</p>', array('@Drupal' => 'http://drupal.org', '%this-site' => variable_get('site_name', 'this website'))) : '';
+<p>So please feel free to log in to your account here at %this-site with a username from another Drupal site. The format of a Drupal ID is similar to an e-mail address: <strong>username</strong>@<em>server</em>. An example of a valid Drupal ID is <strong>mwlily</strong>@<em>drupal.org</em>.</p>', array('@Drupal' => 'http://drupal.org', '%this-site' => variable_get('site_name', 'Drupal'))) : '';
}
}
diff --git a/modules/system/system.module b/modules/system/system.module
index 4665ee86f04726773075fd25b0aa1832bc5a0ede..86fc004bcada29dfb330ae3b76fec4d7b1415a73 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -838,7 +838,7 @@ function system_site_maintenance_settings() {
$form['site_offline_message'] = array(
'#type' => 'textarea',
'#title' => t('Site off-line message'),
- '#default_value' => variable_get('site_offline_message', t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', t('This Drupal site'))))),
+ '#default_value' => variable_get('site_offline_message', t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal')))),
'#description' => t('Message to show visitors when the site is in off-line mode.')
);
diff --git a/modules/user/user.module b/modules/user/user.module
index 3095d75aa949ddc7860b38a3f3f00f5bdc74725b..4707376005be13885ab6bd9358abe00673aa19bf 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -897,10 +897,10 @@ function user_login($msg = '') {
'#attributes' => array('tabindex' => '1'),
);
if (variable_get('drupal_authentication_service', FALSE) && count(user_auth_help_links()) > 0) {
- $form['name']['#description'] = t('Enter your @s username, or an ID from one of our affiliates: !a.', array('@s' => variable_get('site_name', 'local'), '!a' => implode(', ', user_auth_help_links())));
+ $form['name']['#description'] = t('Enter your @s username, or an ID from one of our affiliates: !a.', array('@s' => variable_get('site_name', 'Drupal'), '!a' => implode(', ', user_auth_help_links())));
}
else {
- $form['name']['#description'] = t('Enter your @s username.', array('@s' => variable_get('site_name', 'local')));
+ $form['name']['#description'] = t('Enter your @s username.', array('@s' => variable_get('site_name', 'Drupal')));
}
$form['pass'] = array('#type' => 'password',
'#title' => t('Password'),
@@ -2331,7 +2331,7 @@ function user_help($section) {
case 'admin/user/search':
return t('<p>Enter a simple pattern ("*" may be used as a wildcard match) to search for a username. For example, one may search for "br" and Drupal might return "brian", "brad", and "brenda".</p>');
case 'user/help#user':
- $site = variable_get('site_name', 'this website');
+ $site = variable_get('site_name', 'Drupal');
$affiliates = user_auth_help_links();
if (count($affiliates)) {
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index 12100e0bfa6f6973d162bb51d0b1b2ae54c735cb..65e159ac8aed437dea5636906f13953b599a230e 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -35,7 +35,7 @@ function chameleon_page($content, $show_blocks = TRUE) {
$output = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
$output .= "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"$language\" xml:lang=\"$language\">\n";
$output .= "<head>\n";
- $output .= " <title>". ($title ? strip_tags($title) ." | ". variable_get("site_name", "Drupal") : variable_get("site_name", "drupal") ." | ". variable_get("site_slogan", "")) ."</title>\n";
+ $output .= " <title>". ($title ? strip_tags($title) ." | ". variable_get("site_name", "Drupal") : variable_get("site_name", "Drupal") ." | ". variable_get("site_slogan", "")) ."</title>\n";
$output .= drupal_get_html_head();
$output .= drupal_get_css();
$output .= drupal_get_js();
diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine
index b3d8843ef7865d188259d86be055a52955a9f8fd..823239633f1348a11cd15531d6530132a9127600 100644
--- a/themes/engines/phptemplate/phptemplate.engine
+++ b/themes/engines/phptemplate/phptemplate.engine
@@ -189,7 +189,7 @@ function phptemplate_page($content, $show_blocks = TRUE) {
$head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal'));
}
else {
- $head_title = array(variable_get('site_name', 'drupal'));
+ $head_title = array(variable_get('site_name', 'Drupal'));
if (variable_get('site_slogan', '')) {
$head_title[] = variable_get('site_slogan', '');
}