diff options
| -rw-r--r-- | install.php | 2 | ||||
| -rw-r--r-- | modules/aggregator/aggregator.module | 2 | ||||
| -rw-r--r-- | modules/drupal/drupal.module | 2 | ||||
| -rw-r--r-- | modules/locale/locale.module | 2 | ||||
| -rw-r--r-- | modules/statistics/statistics.module | 2 | ||||
| -rw-r--r-- | modules/system/system.module | 4 | ||||
| -rw-r--r-- | modules/watchdog/watchdog.module | 2 | ||||
| -rw-r--r-- | sites/default/settings.php | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/install.php b/install.php index ef790cea4..bc2d4c335 100644 --- a/install.php +++ b/install.php @@ -280,7 +280,7 @@ function install_settings_form($profile, $install_locale, $settings_file, $db_ur '#default_value' => $db_prefix, '#size' => 45, '#maxlength' => 45, - '#description' => st('If more than one @drupal web site will be sharing this database, enter a table prefix for your @drupal site here.', array('@drupal' => drupal_install_profile_name())), + '#description' => st('If more than one @drupal website will be sharing this database, enter a table prefix for your @drupal site here.', array('@drupal' => drupal_install_profile_name())), ); $form['save'] = array( diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 397e3650d..56add8a25 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -415,7 +415,7 @@ function aggregator_form_feed($edit = array()) { '#title' => t('Title'), '#default_value' => $edit['title'], '#maxlength' => 255, - '#description' => t('The name of the feed; typically the name of the web site you syndicate content from.'), + '#description' => t('The name of the feed; typically the name of the website you syndicate content from.'), '#required' => TRUE, ); $form['url'] = array('#type' => 'textfield', diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module index a70336427..2eb7570d0 100644 --- a/modules/drupal/drupal.module +++ b/modules/drupal/drupal.module @@ -68,7 +68,7 @@ function drupal_sites_registry_settings() { '#title' => t('Register with a Drupal server'), '#default_value' => variable_get('drupal_register', 0), '#options' => $options, - '#description' => t("If enabled, your Drupal site will register itself with the specified Drupal XML-RPC server. For this to work properly, you must set your site's name, e-mail address, slogan and mission statement. When the Drupal XML-RPC server field is set to %drupal-xml-rpc, your web site will register itself with drupal.org. Requires the cron feature to be enabled.", array("%drupal-xml-rpc" => "http://drupal.org/xmlrpc.php")) + '#description' => t("If enabled, your Drupal site will register itself with the specified Drupal XML-RPC server. For this to work properly, you must set your site's name, e-mail address, slogan and mission statement. When the Drupal XML-RPC server field is set to %drupal-xml-rpc, your website will register itself with drupal.org. Requires the cron feature to be enabled.", array("%drupal-xml-rpc" => "http://drupal.org/xmlrpc.php")) ); $form['drupal_server'] = array( diff --git a/modules/locale/locale.module b/modules/locale/locale.module index 89408678f..df8103cc1 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -19,7 +19,7 @@ function locale_help($section) { switch ($section) { case 'admin/help#locale': - $output = '<p>'. t('The locale module allows you to present your Drupal site in a language other than the default English. You can use it to set up a multi-lingual web site or replace given <em>built-in</em> text with text which has been customized for your site. Whenever the locale module encounters text which needs to be displayed, it tries to translate it into the currently selected language. If a translation is not available, then the string is remembered, so you can look up untranslated strings easily.') .'</p>'; + $output = '<p>'. t('The locale module allows you to present your Drupal site in a language other than the default English. You can use it to set up a multi-lingual website or replace given <em>built-in</em> text with text which has been customized for your site. Whenever the locale module encounters text which needs to be displayed, it tries to translate it into the currently selected language. If a translation is not available, then the string is remembered, so you can look up untranslated strings easily.') .'</p>'; $output .= '<p>'. t('The locale module provides two options for providing translations. The first is the integrated web interface, via which you can search for untranslated strings, and specify their translations. An easier and less time-consuming method is to import existing translations for your language. These translations are available as <em>GNU gettext Portable Object files</em> (<em>.po</em> files for short). Translations for many languages are available for download from the translation page.') .'</p>'; $output .= '<p>'. t("If an existing translation does not meet your needs, the <em>.po</em> files are easily edited with special editing tools. The locale module's import feature allows you to add strings from such files into your site's database. The export functionality enables you to share your translations with others, generating Portable Object files from your site strings.") .'</p>'; $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@locale">Locale page</a>.', array('@locale' => 'http://drupal.org/handbook/modules/locale/')) .'</p>'; diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module index 4ccbb2006..9bfaf9056 100644 --- a/modules/statistics/statistics.module +++ b/modules/statistics/statistics.module @@ -38,7 +38,7 @@ function statistics_help($section) { case 'admin/logs/hits': return '<p>'. t('This page shows you the most recent hits.') .'</p>'; case 'admin/logs/referrers': - return '<p>'. t('This page shows you all external referrers. These are links pointing to your web site from outside your web site.') .'</p>'; + return '<p>'. t('This page shows you all external referrers. These are links pointing to your website from outside your website.') .'</p>'; case 'admin/logs/visitors': return '<p>'. t("When you ban a visitor, you prevent the visitor's IP address from accessing your site. Unlike blocking a user, banning a visitor works even for anonymous users. The most common use for this is to block bots/web crawlers that are consuming too many resources.") .'</p>'; } diff --git a/modules/system/system.module b/modules/system/system.module index e77483f51..3bf4d19e6 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -16,7 +16,7 @@ function system_help($section) { switch ($section) { case 'admin/help#system': - $output = '<p>'. t('The system module provides system-wide defaults such as running jobs at a particular time, and storing web pages to improve efficiency. The ability to run scheduled jobs makes administering the web site more usable, as administrators do not have to manually start jobs. The storing of web pages, or caching, allows the site to efficiently re-use web pages and improve web site performance. The settings module provides control over preferences, behaviours including visual and operational settings.') .'</p>'; + $output = '<p>'. t('The system module provides system-wide defaults such as running jobs at a particular time, and storing web pages to improve efficiency. The ability to run scheduled jobs makes administering the website more usable, as administrators do not have to manually start jobs. The storing of web pages, or caching, allows the site to efficiently re-use web pages and improve website performance. The settings module provides control over preferences, behaviours including visual and operational settings.') .'</p>'; $output .= '<p>'. t('Some modules require regularly scheduled actions, such as cleaning up logfiles. Cron, which stands for chronograph, is a periodic command scheduler executing commands at intervals specified in seconds. It can be used to control the execution of daily, weekly and monthly jobs (or anything with a period measured in seconds). The aggregator module periodically updates feeds using cron. Ping periodically notifies services of new content on your site. Search periodically indexes the content on your site. Automating tasks is one of the best ways to keep a system running smoothly, and if most of your administration does not require your direct involvement, cron is an ideal solution. Cron can, if necessary, also be run manually.') .'</p>'; $output .= '<p>'. t("There is a caching mechanism which stores dynamically generated web pages in a database. By caching a web page, the system module does not have to create the page each time someone wants to view it, instead it takes only one SQL query to display it, reducing response time and the server's load. Only pages requested by <em>anonymous</em> users are cached. In order to reduce server load and save bandwidth, the system module stores and sends cached pages compressed.") .'</p>'; $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@system">System page</a>.', array('@system' => 'http://drupal.org/handbook/modules/system/')) .'</p>'; @@ -525,7 +525,7 @@ function system_site_information_settings() { '#type' => 'textfield', '#title' => t('Name'), '#default_value' => variable_get('site_name', 'Drupal'), - '#description' => t('The name of this web site.'), + '#description' => t('The name of this website.'), '#required' => TRUE ); $form['site_mail'] = array( diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module index 9c584cd86..b1f112b45 100644 --- a/modules/watchdog/watchdog.module +++ b/modules/watchdog/watchdog.module @@ -23,7 +23,7 @@ function watchdog_help($section) { $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="@watchdog">Watchdog page</a>.', array('@watchdog' => 'http://drupal.org/handbook/modules/watchdog/')) .'</p>'; return $output; case 'admin/logs': - return '<p>'. t('The watchdog module monitors your web site, capturing system events in a log to be reviewed by an authorized individual at a later time. The watchdog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information. It is vital to check the watchdog report on a regular basis as it is often the only way to tell what is going on.') .'</p>'; + return '<p>'. t('The watchdog module monitors your website, capturing system events in a log to be reviewed by an authorized individual at a later time. The watchdog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information. It is vital to check the watchdog report on a regular basis as it is often the only way to tell what is going on.') .'</p>'; } } diff --git a/sites/default/settings.php b/sites/default/settings.php index 8ab4c142b..37b0498d7 100644 --- a/sites/default/settings.php +++ b/sites/default/settings.php @@ -90,7 +90,7 @@ * $db_url = 'mysqli://username:password@localhost/databasename'; * $db_url = 'pgsql://username:password@localhost/databasename'; */ -$db_url = 'mysql://username:password@localhost/databasename'; +$db_url = 'mysql://drupal:drupal@localhost/drupal'; $db_prefix = ''; /** |