Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. They are usually generated automatically by modules, but administrators can create blocks manually.
Only enabled blocks are shown. You can position blocks by specifying which area of the page they should appear in (e.g., a sidebar). Highlighted labels on this page show the regions into which blocks can be rendered. You can specify where within a region a block will appear by adjusting its weight.
If you want certain blocks to disable themselves temporarily during high server loads, check the "Throttle" box. You can configure the auto-throttle on the throttle configuration page after having enabled the throttle module.
-You can configure the behaviour of each block (for example, specifying on which pages and for what users it will appear) by clicking the "configure" link for each block.
', array('@throttle' => url('admin/settings/throttle'))); +You can configure the behavior of each block (for example, specifying on which pages and for what users it will appear) by clicking the "configure" link for each block.
', array('@throttle' => url('admin/settings/throttle'))); case 'admin/build/block/add': return ''. t('Here you can create a new block. Once you have created this block you must make it active and give it a place on the page using blocks. The description is used in the "block" column on the blocks page.', array('@overview' => url('admin/build/block'))) .'
'; } Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.593 diff -u -r1.593 comment.module --- modules/comment/comment.module 19 Oct 2007 10:19:02 -0000 1.593 +++ modules/comment/comment.module 19 Oct 2007 14:05:38 -0000 @@ -127,7 +127,7 @@ switch ($path) { case 'admin/help#comment': $output = ''. t('The comment module creates a discussion board for each post. Users can post comments to discuss a forum topic, weblog post, story, collaborative book page, etc. The ability to comment is an important part of involving members in a community dialogue.') .'
'; - $output .= ''. t('An administrator can give comment permissions to user groups, and users can (optionally) edit their last comment, assuming no others have been posted since. Attached to each comment board is a control panel for customizing the way that comments are displayed. Users can control the chronological ordering of posts (newest or oldest first) and the number of posts to display on each page. Comments behave like other user submissions. Filters, smileys and HTML that work in nodes will also work with comments. The comment module provides specific features to inform site members when new comments have been posted.') .'
'; + $output .= ''. t('An administrator can give comment permissions to user groups, and users can (optionally) edit their last comment, assuming no others have been posted since. Attached to each comment board is a control panel for customizing the way that comments are displayed. Users can control the chronological ordering of posts (newest or oldest first) and the number of posts to display on each page. Comments behave like other user submissions. Filters, smilies and HTML that work in nodes will also work with comments. The comment module provides specific features to inform site members when new comments have been posted.') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Comment page.', array('@comment' => 'http://drupal.org/handbook/modules/comment/')) .'
'; return $output; case 'admin/content/comment': @@ -1958,7 +1958,7 @@ function _comment_delete_thread($comment) { if (!is_object($comment) || !is_numeric($comment->cid)) { - watchdog('content', 'Can not delete non-existent comment.', WATCHDOG_WARNING); + watchdog('content', 'Cannot delete non-existent comment.', WATCHDOG_WARNING); return; } Index: modules/filter/filter.install =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.install,v retrieving revision 1.2 diff -u -r1.2 filter.install --- modules/filter/filter.install 10 Oct 2007 11:39:32 -0000 1.2 +++ modules/filter/filter.install 19 Oct 2007 13:40:45 -0000 @@ -71,7 +71,7 @@ 'not null' => TRUE, 'default' => 0, 'size' => 'tiny', - 'description' => t('Flag to indicate whether format is cachable. (1 = cachable, 0 = not cachable)'), + 'description' => t('Flag to indicate whether format is cacheable. (1 = cacheable, 0 = not cacheable)'), ), ), 'unique keys' => array('name' => array('name')), Index: modules/locale/locale.install =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.install,v retrieving revision 1.19 diff -u -r1.19 locale.install --- modules/locale/locale.install 12 Oct 2007 14:10:17 -0000 1.19 +++ modules/locale/locale.install 19 Oct 2007 14:01:26 -0000 @@ -146,7 +146,7 @@ 'length' => 12, 'not null' => TRUE, 'default' => '', - 'description' => t("Language code, eg 'de' or 'en-US'."), + 'description' => t("Language code, e.g. 'de' or 'en-US'."), ), 'name' => array( 'type' => 'varchar', Index: modules/locale/locale.module =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v retrieving revision 1.195 diff -u -r1.195 locale.module --- modules/locale/locale.module 15 Oct 2007 19:51:06 -0000 1.195 +++ modules/locale/locale.module 19 Oct 2007 14:04:27 -0000 @@ -32,8 +32,8 @@ function locale_help($path, $arg) { switch ($path) { case 'admin/help#locale': - $output = ''. 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 built-in 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.') .'
'; - $output .= ''. 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 GNU gettext Portable Object files (.po files for short). Translations for many languages are available for download from the translation page.') .'
'; + $output = ''. 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 built-in 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 un-translated strings easily.') .'
'; + $output .= ''. t('The locale module provides two options for providing translations. The first is the integrated web interface, via which you can search for un-translated 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 GNU gettext Portable Object files (.po files for short). Translations for many languages are available for download from the translation page.') .'
'; $output .= ''. t("If an existing translation does not meet your needs, the .po 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.") .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Locale page.', array('@locale' => 'http://drupal.org/handbook/modules/locale/')) .'
'; return $output; @@ -41,18 +41,18 @@ case 'admin/settings/language': return t("Drupal provides support for the translation of its interface text into different languages. This page provides an overview of the installed languages. You can add a language on the add language page, or directly by importing a translation. If multiple languages are enabled, registered users will be able to set their preferred language. The site default will be used for anonymous visitors and for users without their own settings.
Drupal interface translations may be added or extended by several courses: by importing an existing translation, by translating everything from scratch, or by a combination of these approaches.
", array("@search" => url("admin/build/translate/search"), "@import" => url("admin/build/translate/import"), "@add-language" => url("admin/settings/language/add"))); case 'admin/settings/language/add': - return ''. t("You need to add all languages in which you would like to display the site interface. If you can't find the desired language in the quick-add dropdown, then you will need to provide the proper language code yourself. The language code may be used to negotiate with browsers and to present flags, etc., so it is important to pick a code that is standardised for the desired language. You can also add a language by importing a translation.", array("@import" => url("admin/build/translate/import"))) .'
'; + return ''. t("You need to add all languages in which you would like to display the site interface. If you can't find the desired language in the quick-add dropdown, then you will need to provide the proper language code yourself. The language code may be used to negotiate with browsers and to present flags, etc., so it is important to pick a code that is standardized for the desired language. You can also add a language by importing a translation.", array("@import" => url("admin/build/translate/import"))) .'
'; case 'admin/settings/language/configure': return ''. t('The language used to display a web page is determined with a negotiation algorithm. You can choose how this algorithm should work. By default, there is no negotiation and the default language is used. You can use path prefixes (like "de" and "it" for German and Italian content) with different fallback options, so you can have web addresses like /de/contact and /it/contact. Alternatively you can use custom domains like de.example.com and it.example.com. Customize path prefixes and set domain names on the language editing pages.', array('@languages' => url('admin/settings/language'))) .'
'; case 'admin/build/translate': - return ''. t("This page provides an overview of interface translation on the site. Drupal groups all translatable strings in so called 'text groups'. Modules may provide more text groups additionaly to the 'built-in interface' default, to separate strings used for other purposes, allowing you to focus your translation efforts on the groups of text you care most about. For example, a translation team could choose not to fully translate a text group that includes less important data, being still able to ensure that built-in interface is always fully translated.") .'
'; + return ''. t("This page provides an overview of interface translation on the site. Drupal groups all translatable strings in so called 'text groups'. Modules may provide more text groups to the 'built-in interface' default to separate strings used for other purposes, allowing you to focus your translation efforts on the groups of text you care most about. For example, a translation team could choose not to fully translate a text group that includes less important data, being still able to ensure that built-in interface is always fully translated.") .'
'; case 'admin/build/translate/import': return ''. t("This page allows you to import a translation provided in the gettext Portable Object (.po) format. The easiest way to get your site translated is to obtain an existing Drupal translation and to import it. You can find existing translations on the Drupal translation page. Note that importing a translation file might take a while.", array('@url' => 'http://drupal.org/project/translations')) .'
'; case 'admin/build/translate/export': return ''. t("This page allows you to export Drupal strings. The first option is to export a translation so it can be shared. The second option generates a translation template, which contains all Drupal strings, but without their translations. You can use this template to start a new translation using various software packages designed for this task.") .'
'; case 'admin/build/translate/search': - return ''. t("It is often convenient to get the strings from your setup on the export page, and use a desktop Gettext translation editor to edit the translations. On this page you can search in the translated and untranslated strings, and the default English texts provided by Drupal.", array("@export" => url("admin/build/translate/export"))) .'
'; + return ''. t("It is often convenient to get the strings from your setup on the export page, and use a desktop Gettext translation editor to edit the translations. On this page you can search in the translated and un-translated strings, and the default English texts provided by Drupal.", array("@export" => url("admin/build/translate/export"))) .'
'; case 'admin/build/block/configure': if ($arg[4] == 'locale' && $arg[5] == 0) { @@ -356,7 +356,7 @@ } } else { - // We don't have the source string, cache this as untranslated. + // We don't have the source string, cache this as un-translated. db_query("INSERT INTO {locales_source} (location, source, textgroup, version) VALUES ('%s', '%s', 'default', '%s')", request_uri(), $string, VERSION); $locale_t[$langcode][$string] = TRUE; // Clear locale cache so this string can be added in a later request. Index: modules/menu/menu.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v retrieving revision 1.3 diff -u -r1.3 menu.admin.inc --- modules/menu/menu.admin.inc 27 Sep 2007 16:59:54 -0000 1.3 +++ modules/menu/menu.admin.inc 19 Oct 2007 13:48:05 -0000 @@ -492,7 +492,7 @@ '#default_value' => variable_get('menu_secondary_links_source', 'secondary-links'), '#options' => $secondary_options, '#tree' => FALSE, - '#description' => t('Select what should be displayed as the secondary links . If %primary is choosen the children of the active primary menu link (if any) will be shown instead of the links in the %secondary menu.', array('%secondary' => $menu_options['secondary-links'], '%primary' => $menu_options['primary-links'])), + '#description' => t('Select what should be displayed as the secondary links . If %primary is chosen, the children of the active primary menu link (if any) will be shown instead of the links in the %secondary menu.', array('%secondary' => $menu_options['secondary-links'], '%primary' => $menu_options['primary-links'])), ); return system_settings_form($form); Index: modules/menu/menu.module =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v retrieving revision 1.145 diff -u -r1.145 menu.module --- modules/menu/menu.module 7 Oct 2007 09:50:01 -0000 1.145 +++ modules/menu/menu.module 19 Oct 2007 13:48:05 -0000 @@ -18,8 +18,8 @@ function menu_help($path, $arg) { switch ($path) { case 'admin/help#menu': - $output = t('Menus are a collection of links (menu items) used to navigate a website. The menu module provides an interface to control and customize the powerful menu system that comes with Drupal. Menus are primarily displayed as a hierarchical list of links using Drupal\'s highly flexible blocks feature. Each menu automatically creates a block of the same name. By default, new menu items are placed inside a built-in menu labelled %navigation, but administrators can also create custom menus.
-Drupal themes generally provide out-of-the-box support for two menus commonly labelled %primary-links and %secondary-links. These are sets of links which are usually displayed in the header or footer of each page (depending on the currently active theme).
+ $output = t('Menus are a collection of links (menu items) used to navigate a website. The menu module provides an interface to control and customize the powerful menu system that comes with Drupal. Menus are primarily displayed as a hierarchical list of links using Drupal\'s highly flexible blocks feature. Each menu automatically creates a block of the same name. By default, new menu items are placed inside a built-in menu labeled %navigation, but administrators can also create custom menus.
+Drupal themes generally provide out-of-the-box support for two menus commonly labeled %primary-links and %secondary-links. These are sets of links which are usually displayed in the header or footer of each page (depending on the currently active theme).
Menu administration tabs:'. t('The poll module can be used to create simple polls for site users. A poll is a simple multiple choice questionnaire which displays the cumulative results of the answers to the poll. Having polls on the site is a good way to get instant feedback from community members.') .'
'; - $output .= ''. t('Users can create a poll. The title of the poll should be the question, then enter the answers and the "base" vote counts. You can also choose the time period over which the vote will run.The poll item in the navigation menu will take you to a page where you can see all the current polls, vote on them (if you haven\'t already) and view the results.', array('@poll' => url('poll'))) .'
'; + $output .= ''. t('Users can create a poll. The title of the poll should be the question, then enter the answers and the "base" vote counts. You can also choose the time period over which the vote will run. The poll item in the navigation menu will take you to a page where you can see all the current polls, vote on them (if you haven\'t already) and view the results.', array('@poll' => url('poll'))) .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Poll page.', array('@poll' => 'http://drupal.org/handbook/modules/poll/')) .'
'; return $output; } Index: modules/search/search.module =================================================================== RCS file: /cvs/drupal/drupal/modules/search/search.module,v retrieving revision 1.236 diff -u -r1.236 search.module --- modules/search/search.module 1 Oct 2007 08:50:36 -0000 1.236 +++ modules/search/search.module 19 Oct 2007 13:40:45 -0000 @@ -97,11 +97,11 @@ switch ($path) { case 'admin/help#search': $output = ''. t('The search module adds the ability to search for content by keywords. Search is often the only practical way to find content on a large site. Search is useful for finding users and posts by searching on keywords.') .'
'; - $output .= ''. t('The search engine works by maintaining an index of the words in your site\'s content. It indexes the posts and users. You can adjust the settings to tweak the indexing behaviour. Note that the search requires cron to be set up correctly. The index percentage sets the maximum amount of items that will be indexed in one cron run. Set this number lower if your cron is timing out or if PHP is running out of memory.') .'
'; + $output .= ''. t('The search engine works by maintaining an index of the words in your site\'s content. It indexes the posts and users. You can adjust the settings to tweak the indexing behavior. Note that the search requires cron to be set up correctly. The index percentage sets the maximum amount of items that will be indexed in one cron run. Set this number lower if your cron is timing out or if PHP is running out of memory.') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Search page.', array('@search' => 'http://drupal.org/handbook/modules/search/')) .'
'; return $output; case 'admin/settings/search': - return ''. t('The search engine works by maintaining an index of the words in your site\'s content. You can adjust the settings below to tweak the indexing behaviour. Note that the search requires cron to be set up correctly.') .'
'; + return ''. t('The search engine works by maintaining an index of the words in your site\'s content. You can adjust the settings below to tweak the indexing behavior. Note that the search requires cron to be set up correctly.') .'
'; case 'search#noresults': return t(''. 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 system module provides control over preferences, behaviours including visual and operational settings.') .'
'; + $output = ''. 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 system module provides control over preferences, behaviors including visual and operational settings.') .'
'; $output .= ''. 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.') .'
'; $output .= ''. 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 anonymous users are cached. In order to reduce server load and save bandwidth, the system module stores and sends cached pages compressed.") .'
'; $output .= ''. t('For more information please read the configuration and customization handbook System page.', array('@system' => 'http://drupal.org/handbook/modules/system/')) .'
'; Index: modules/taxonomy/taxonomy.install =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.install,v retrieving revision 1.3 diff -u -r1.3 taxonomy.install --- modules/taxonomy/taxonomy.install 12 Oct 2007 14:10:18 -0000 1.3 +++ modules/taxonomy/taxonomy.install 19 Oct 2007 13:54:45 -0000 @@ -215,7 +215,7 @@ 'not null' => TRUE, 'default' => 0, 'size' => 'tiny', - 'description' => t('Whether or not multiple terms from this vocablulary may be assigned to a node. (0 = disabled, 1 = enabled)'), + 'description' => t('Whether or not multiple terms from this vocabulary may be assigned to a node. (0 = disabled, 1 = enabled)'), ), 'required' => array( 'type' => 'int', Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.853 diff -u -r1.853 user.module --- modules/user/user.module 12 Oct 2007 10:41:48 -0000 1.853 +++ modules/user/user.module 19 Oct 2007 13:52:58 -0000 @@ -2127,7 +2127,7 @@ // No e-mail verification is required, create new user account, and login user immediately. _user_mail_notify('register_no_approval_required', $account); if (user_authenticate($account->name, trim($pass))) { - drupal_set_message(t('Registration succesful. You are now logged in.')); + drupal_set_message(t('Registration successful. You are now logged in.')); } $form_state['redirect'] = ''; return;