To set up your @drupal database, enter the following information.
', array('@drupal' => drupal_install_profile_name())), + '#description' => ''. st('To set up your @drupal database, enter the following information.', array('@drupal' => drupal_install_profile_name())) .'
', ); if (count($db_types) > 1) { @@ -242,7 +242,7 @@ function install_settings_form($profile, '#title' => st('Advanced options'), '#collapsible' => TRUE, '#collapsed' => TRUE, - '#description' => st('These options are only necessary for some sites. If you\'re not sure what you should enter here, leave the default settings or check with your hosting provider.') + '#description' => st("These options are only necessary for some sites. If you're not sure what you should enter here, leave the default settings or check with your hosting provider.") ); // Database host @@ -273,7 +273,7 @@ function install_settings_form($profile, '#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( @@ -324,7 +324,7 @@ function _install_settings_form_validate } $databases = drupal_detect_database_types(); if (!in_array($db_type, $databases)) { - form_set_error('db_type', st("In your %settings_file file you have configured @drupal to use a %db_type server, however your PHP installation currently does not support this database type.", array('%settings_file' => $settings_file, '@drupal' => drupal_install_profile_name(), '%db_type' => $db_type))); + form_set_error('db_type', st('In your %settings_file file you have configured @drupal to use a %db_type server, however your PHP installation currently does not support this database type.', array('%settings_file' => $settings_file, '@drupal' => drupal_install_profile_name(), '%db_type' => $db_type))); } else { // Verify @@ -436,7 +436,7 @@ function install_select_locale($profilen include_once './includes/form.inc'; // Collect possible locales, add default - $locales = file_scan_directory('./profiles/' . $profilename, '\.po$', array('.', '..', 'CVS'), 0, FALSE); + $locales = file_scan_directory('./profiles/'. $profilename, '\.po$', array('.', '..', 'CVS'), 0, FALSE); array_unshift($locales, (object) array('name' => 'en')); // Don't need to choose locale if only one (English) is available. @@ -464,13 +464,13 @@ function install_select_locale_form($loc // Try to use verbose locale name $name = $locale->name; if (isset($languages[$name])) { - $name = $languages[$name][0] . (isset($languages[$name][1]) ? ' (' . $languages[$name][1] . ')' : ''); + $name = $languages[$name][0] . (isset($languages[$name][1]) ? st(' (@language)', array('@language' => $languages[$name][1])) : ''); } $form['locale'][$locale->name] = array( '#type' => 'radio', '#return_value' => $locale->name, '#default_value' => ($locale->name == 'en' ? TRUE : FALSE), - '#title' => $name . ($locale->name == 'en' ? ' (built-in)' : ''), + '#title' => $name . ($locale->name == 'en' ? st(' (built-in)') : ''), '#parents' => array('locale') ); } @@ -487,7 +487,7 @@ function install_select_locale_form($loc function install_no_profile_error() { drupal_maintenance_theme(); drupal_set_title(st('No profiles available')); - print theme('install_page', st('We were unable to find any installer profiles. Installer profiles tell us what modules to enable and what schema to install in the database. A profile is necessary to continue with the installation process.
')); + print theme('install_page', ''. st('We were unable to find any installer profiles. Installer profiles tell us what modules to enable and what schema to install in the database. A profile is necessary to continue with the installation process.')) .'
'; exit; } @@ -532,7 +532,7 @@ function install_complete($profile) { // Build final page. drupal_maintenance_theme(); drupal_set_title(st('@drupal installation complete', array('@drupal' => drupal_install_profile_name()))); - $output .= st('Congratulations, @drupal has been successfully installed.
', array('@drupal' => drupal_install_profile_name())); + $output .= ''. st('Congratulations, @drupal has been successfully installed.', array('@drupal' => drupal_install_profile_name())) .'
'; // Show profile finalization info. $function = $profile .'_profile_final'; @@ -542,7 +542,7 @@ function install_complete($profile) { } else { // No more steps - $output .= '' . (drupal_set_message() ? st('Please review the messages above before continuing on to your new site.', array('@url' => url(''))) : st('You may now visit your new site.', array('@url' => url('')))) . '
'; + $output .= ''. (drupal_set_message() ? st('Please review the messages above before continuing on to your new site.', array('@url' => url(''))) : st('You may now visit your new site.', array('@url' => url('')))) .'
'; } // Output page. print theme('maintenance_page', $output); @@ -565,7 +565,7 @@ function install_check_requirements($pro } } - drupal_set_title('Incompatible environment'); + drupal_set_title(st('Incompatible environment')); print theme('install_page', ''); exit; } Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.319 diff -u -p -r1.319 theme.inc --- includes/theme.inc 8 Nov 2006 19:24:11 -0000 1.319 +++ includes/theme.inc 16 Nov 2006 05:37:18 -0000 @@ -1018,7 +1018,7 @@ function theme_username($object) { $output .= ' ('. t('not verified') .')'; } else { - $output = variable_get('anonymous', 'Anonymous'); + $output = variable_get('anonymous', t('Anonymous')); } return $output; Index: modules/aggregator/aggregator.module =================================================================== RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator.module,v retrieving revision 1.312 diff -u -p -r1.312 aggregator.module --- modules/aggregator/aggregator.module 23 Oct 2006 20:25:03 -0000 1.312 +++ modules/aggregator/aggregator.module 16 Nov 2006 05:37:20 -0000 @@ -28,11 +28,11 @@ function aggregator_help($section) { $output .= ''. t('For more information please read the configuration and customization handbook Aggregator page.', array('@aggregator' => 'http://drupal.org/handbook/modules/aggregator/')) .'
'; return $output; case 'admin/content/aggregator': - return t('Thousands of sites (particularly news sites and weblogs) publish their latest headlines and/or stories in a machine-readable format so that other sites can easily link to them. This content is usually in the form of an RSS feed (which is an XML-based syndication standard). To display the feed or category in a block you must decide how many items to show by editing the feed or block and turning on the feed\'s block.
', array('@block' => url('admin/build/block'))); + return ''. t('Thousands of sites (particularly news sites and weblogs) publish their latest headlines and/or stories in a machine-readable format so that other sites can easily link to them. This content is usually in the form of an RSS feed (which is an XML-based syndication standard). To display the feed or category in a block you must decide how many items to show by editing the feed or block and turning on the feed\'s block.', array('@block' => url('admin/build/block'))) .'
'; case 'admin/content/aggregator/add/feed': - return t('Add a site that has an RSS/RDF/Atom feed. The URL is the full path to the feed file. For the feed to update automatically you must run "cron.php" on a regular basis. If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.
'); + return ''. t('Add a site that has an RSS/RDF/Atom feed. The URL is the full path to the feed file. For the feed to update automatically you must run "cron.php" on a regular basis. If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.') .'
'; case 'admin/content/aggregator/add/category': - return t('Categories provide a way to group items from different news feeds together. Each news category has its own feed page and block. For example, you could tag various sport-related feeds as belonging to a category called Sports. News items can be added to a category automatically by setting a feed to automatically place its item into that category, or by using the categorize items link in any listing of news items.
'); + return ''. t('Categories provide a way to group items from different news feeds together. Each news category has its own feed page and block. For example, you could tag various sport-related feeds as belonging to a category called Sports. News items can be added to a category automatically by setting a feed to automatically place its item into that category, or by using the categorize items link in any listing of news items.') .'
'; } } @@ -47,7 +47,7 @@ function aggregator_menu($may_cache) { if ($may_cache) { $items[] = array('path' => 'admin/content/aggregator', 'title' => t('RSS aggregator'), - 'description' => t('Configure which content your site aggregates from other sites, how often it polls them, and how they\'re categorized.'), + 'description' => t("Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized."), 'callback' => 'aggregator_admin_overview', 'access' => $edit); $items[] = array('path' => 'admin/content/aggregator/add/feed', @@ -296,7 +296,7 @@ function aggregator_block($op = 'list', if ($feed = db_fetch_object(db_query('SELECT fid, title, block FROM {aggregator_feed} WHERE fid = %d', $id))) { $block['subject'] = check_plain($feed->title); $result = db_query_range('SELECT * FROM {aggregator_item} WHERE fid = %d ORDER BY timestamp DESC, iid DESC', $feed->fid, 0, $feed->block); - $block['content'] = ''. t('Blocks are boxes of content that may be rendered into certain regions of your web pages, for example, into sidebars. Blocks are usually generated automatically by modules (e.g., Recent Forum Topics), but administrators can also define custom blocks.') .'
'; $output .= ''. t('The region each block appears in depends on both which theme you are using (some themes allow greater control over block placement than others), and on the settings in the block administration section.') .'
'; $output .= ''. t('The block administration screen lets you specify the vertical placement of the blocks within a region. You do this by assigning a weight to each block. Lighter blocks (those having a smaller weight) "float up" towards the top of the region; heavier ones "sink".') .'
'; - $output .= t('A block\'s visibility depends on:
+ $output .= t("A block's visibility depends on:
'. t('Some modules generate blocks that become available when the modules are enabled. These blocks can be administered via the blocks administration page.
', array('@admin-block' => url('admin/build/block'))) .''; $output .= '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'))); 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 title is used when displaying the block. The description is used in the "block" column on the blocks page.
', array('@overview' => url('admin/build/block'))); + 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 title is used when displaying the block. The description is used in the "block" column on the blocks page.', array('@overview' => url('admin/build/block'))) .'
'; } } @@ -70,7 +70,7 @@ function block_menu($may_cache) { 'path' => 'admin/build/block', 'title' => t('Blocks'), 'access' => user_access('administer blocks'), - 'description' => t('Configure what block content appears in your site\'s sidebars and other regions.'), + 'description' => t("Configure what block content appears in your site's sidebars and other regions."), 'callback' => 'drupal_get_form', 'callback arguments' => array('block_admin_display')); $items[] = array('path' => 'admin/build/block/list', 'title' => t('List'), Index: modules/book/book.module =================================================================== RCS file: /cvs/drupal/drupal/modules/book/book.module,v retrieving revision 1.396 diff -u -p -r1.396 book.module --- modules/book/book.module 14 Nov 2006 06:30:10 -0000 1.396 +++ modules/book/book.module 16 Nov 2006 05:37:21 -0000 @@ -92,7 +92,7 @@ function book_menu($may_cache) { $items[] = array( 'path' => 'admin/content/book', 'title' => t('Books'), - 'description' => t('Manage site\'s books and orphaned book pages.'), + 'description' => t("Manage site's books and orphaned book pages."), 'callback' => 'book_admin', 'access' => user_access('administer nodes')); $items[] = array( @@ -997,9 +997,9 @@ function book_help($section) { $output .= ''. t('For more information please read the configuration and customization handbook Book page.', array('@book' => 'http://drupal.org/handbook/modules/book/')) .'
'; return $output; case 'admin/content/book': - return t('The book module offers a means to organize content, authored by many users, in an online manual, outline or FAQ.
'); + return ''. t('The book module offers a means to organize content, authored by many users, in an online manual, outline or FAQ.') .'
'; case 'admin/content/book/orphan': - return t('Pages in a book are like a tree. As pages are edited, reorganized and removed, child pages might be left with no link to the rest of the book. Such pages are referred to as "orphan pages". On this page, administrators can review their books for orphans and reattach those pages as desired.
'); + return ''. t('Pages in a book are like a tree. As pages are edited, reorganized and removed, child pages might be left with no link to the rest of the book. Such pages are referred to as "orphan pages". On this page, administrators can review their books for orphans and reattach those pages as desired.') .'
'; } if (arg(0) == 'node' && is_numeric(arg(1)) && arg(2) == 'outline') { Index: modules/comment/comment.module =================================================================== RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v retrieving revision 1.496 diff -u -p -r1.496 comment.module --- modules/comment/comment.module 12 Nov 2006 00:11:15 -0000 1.496 +++ modules/comment/comment.module 16 Nov 2006 05:37:24 -0000 @@ -82,11 +82,11 @@ function comment_help($section) { return $output; case 'admin/content/comment': case 'admin/content/comment/new': - return t("Below is a list of the latest comments posted to your site. Click on a subject to see the comment, the author's name to edit the author's user information , \"edit\" to modify the text, and \"delete\" to remove their submission.
"); + return ''. t("Below is a list of the latest comments posted to your site. Click on a subject to see the comment, the author's name to edit the author's user information , 'edit' to modify the text, and 'delete' to remove their submission.") .'
'; case 'admin/content/comment/approval': - return t("Below is a list of the comments posted to your site that need approval. To approve a comment, click on \"edit\" and then change its \"moderation status\" to Approved. Click on a subject to see the comment, the author's name to edit the author's user information, \"edit\" to modify the text, and \"delete\" to remove their submission.
"); + return ''. t('Below is a list of the comments posted to your site that need approval. To approve a comment, click on "edit" and then change its "moderation status" to Approved. Click on a subject to see the comment, the author\'s name to edit the author\'s user information, "edit" to modify the text, and "delete" to remove their submission.') .'
'; case 'admin/content/comment/settings': - return t("Comments can be attached to any node, and their settings are below. The display comes in two types: a \"flat list\" where everything is flush to the left side, and comments come in chronological order, and a \"threaded list\" where replies to other comments are placed immediately below and slightly indented, forming an outline. They also come in two styles: \"expanded\", where you see both the title and the contents, and \"collapsed\" where you only see the title. Preview comment forces a user to look at their comment by clicking on a \"Preview\" button before they can actually add the comment.
"); + return ''. t('Comments can be attached to any node, and their settings are below. The display comes in two types: a "flat list" where everything is flush to the left side, and comments come in chronological order, and a "threaded list" where replies to other comments are placed immediately below and slightly indented, forming an outline. They also come in two styles: "expanded", where you see both the title and the contents, and "collapsed" where you only see the title. Preview comment forces a user to look at their comment by clicking on a "Preview" button before they can actually add the comment.') .'
'; } } @@ -1390,7 +1390,7 @@ function comment_form($edit, $title = NU } } else if (variable_get('comment_anonymous', COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MAY_CONTACT) { - $form['name'] = array('#type' => 'textfield', '#title' => t('Your name'), '#maxlength' => 60, '#size' => 30, '#default_value' => $edit['name'] ? $edit['name'] : variable_get('anonymous', 'Anonymous') + $form['name'] = array('#type' => 'textfield', '#title' => t('Your name'), '#maxlength' => 60, '#size' => 30, '#default_value' => $edit['name'] ? $edit['name'] : variable_get('anonymous', t('Anonymous')) ); $form['mail'] = array('#type' => 'textfield', '#title' => t('E-mail'), '#maxlength' => 64, '#size' => 30, '#default_value' => $edit['mail'], '#description' => t('The content of this field is kept private and will not be shown publicly.') @@ -1399,7 +1399,7 @@ function comment_form($edit, $title = NU $form['homepage'] = array('#type' => 'textfield', '#title' => t('Homepage'), '#maxlength' => 255, '#size' => 30, '#default_value' => $edit['homepage']); } else if (variable_get('comment_anonymous', COMMENT_ANONYMOUS_MAYNOT_CONTACT) == COMMENT_ANONYMOUS_MUST_CONTACT) { - $form['name'] = array('#type' => 'textfield', '#title' => t('Your name'), '#maxlength' => 60, '#size' => 30, '#default_value' => $edit['name'] ? $edit['name'] : variable_get('anonymous', 'Anonymous'), '#required' => TRUE); + $form['name'] = array('#type' => 'textfield', '#title' => t('Your name'), '#maxlength' => 60, '#size' => 30, '#default_value' => $edit['name'] ? $edit['name'] : variable_get('anonymous', t('Anonymous')), '#required' => TRUE); $form['mail'] = array('#type' => 'textfield', '#title' => t('E-mail'), '#maxlength' => 64, '#size' => 30, '#default_value' => $edit['mail'],'#description' => t('The content of this field is kept private and will not be shown publicly.'), '#required' => TRUE); Index: modules/drupal/drupal.module =================================================================== RCS file: /cvs/drupal/drupal/modules/drupal/drupal.module,v retrieving revision 1.130 diff -u -p -r1.130 drupal.module --- modules/drupal/drupal.module 22 Oct 2006 08:28:44 -0000 1.130 +++ modules/drupal/drupal.module 16 Nov 2006 05:37:24 -0000 @@ -40,15 +40,15 @@ print drupal_client_page(); ?>'. t('For more information please read the configuration and customization handbook Drupal page.', array('@drupal' => 'http://drupal.org/handbook/modules/drupal/')) .'
'; return $output; case 'admin/settings/distributed-authentication': - return t('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 site information settings page and set the site name, the e-mail address, the slogan, and the mission statement.
', array('@site-settings' => url('admin/settings/site-information'))); + return ''. t('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 site information settings page and set the site name, the e-mail address, the slogan, and the mission statement.', array('@site-settings' => url('admin/settings/site-information'))) .'
'; case 'user/help#drupal': - return variable_get('drupal_authentication_service', 0) ? t("Drupal is the name of the software that powers %this-site. There are Drupal web sites 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 Drupal ID.
-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: username@server. An example of a valid Drupal ID is mwlily@drupal.org.
", array('@Drupal' => 'http://drupal.org', '%this-site' => variable_get('site_name', 'this web site'))) : ''; + return variable_get('drupal_authentication_service', 0) ? t('Drupal 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 Drupal ID.
+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: username@server. An example of a valid Drupal ID is mwlily@drupal.org.
', array('@Drupal' => 'http://drupal.org', '%this-site' => variable_get('site_name', t('this website')))) : ''; } } @@ -74,7 +74,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( @@ -136,7 +136,7 @@ function drupal_distributed_authenticati '#title' => t('Only allow authentication from default server'), '#default_value' => variable_get('drupal_default_da_server_only', 0), '#options' => $options, - '#description' => t('Only accept remote logins from the above specified default authentication server and not from any other server. Useful when an external system is the solitary authority on user accounts for this site. A common usage is to enable this setting and also enable an authentication module which talks to your company\'s directory server.') + '#description' => t("Only accept remote logins from the above specified default authentication server and not from any other server. Useful when an external system is the solitary authority on user accounts for this site. A common usage is to enable this setting and also enable an authentication module which talks to your company's directory server.") ); return system_settings_form($form); Index: modules/filter/filter.module =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v retrieving revision 1.148 diff -u -p -r1.148 filter.module --- modules/filter/filter.module 26 Oct 2006 05:31:14 -0000 1.148 +++ modules/filter/filter.module 16 Nov 2006 05:37:25 -0000 @@ -20,7 +20,7 @@ define('FILTER_HTML_ESCAPE', 2); function filter_help($section) { switch ($section) { case 'admin/help#filter': - $output = ''. t('The filter module allows administrators to configure text input formats for the site. For example, an administrator may want a filter to strip out malicious HTML from user\'s comments. Administrators may also want to make URLs linkable even if they are only entered in an unlinked format.') .'
'; + $output = ''. t("The filter module allows administrators to configure text input formats for the site. For example, an administrator may want a filter to strip out malicious HTML from user's comments. Administrators may also want to make URLs linkable even if they are only entered in an unlinked format.") .'
'; $output .= ''. t('Users can choose between the available input formats when creating or editing content. Administrators can configure which input formats are available to which user roles, as well as choose a default input format. Administrators can also create new input formats. Each input format can be configured to use a selection of filters.') .'
'; $output .= t('You can
If you notice some filters are causing conflicts in the output, you can rearrange them.
', array('@rearrange' => url('admin/settings/filters/'. arg(3) .'/order'))); case 'admin/settings/filters/'. arg(3) .'/configure': - return t(' -If you cannot find the settings for a certain filter, make sure you\'ve enabled it on the view tab first.
', array('@url' => url('admin/settings/filters/'. arg(3)))); + return ''. t(' +If you cannot find the settings for a certain filter, make sure you have enabled it on the view tab first.', array('@url' => url('admin/settings/filters/'. arg(3)))) .'
'; case 'admin/settings/filters/'. arg(3) .'/order': - return t(' + return t("
Because of the flexible filtering system, you might encounter a situation where one filter prevents another from doing its job. For example: a word in an URL gets converted into a glossary term, before the URL can be converted in a clickable link. When this happens, you will need to rearrange the order in which filters get executed.
-Filters are executed from top-to-bottom. You can use the weight column to rearrange them: heavier filters \'sink\' to the bottom.
'); +Filters are executed from top-to-bottom. You can use the weight column to rearrange them: heavier filters 'sink' to the bottom.
"); } } @@ -461,9 +461,9 @@ function filter_admin_format_form($forma $extra = ''. l(t('More information about formatting options'), 'filter/tips') .'
'; $tiplist = theme('filter_tips', $tips, FALSE, $extra); if (!$tiplist) { - $tiplist = t('No guidelines available.
'); + $tiplist = ''. t('No guidelines available.') .'
'; } - $group = t('These are the guidelines that users will see for posting in this input format. They are automatically generated from the filter settings.
'); + $group = ''. t('These are the guidelines that users will see for posting in this input format. They are automatically generated from the filter settings.') .'
'; $group .= $tiplist; $form['tips'] = array('#value' => ''. t('For more information please read the configuration and customization handbook Forum page.', array('@forum' => 'http://drupal.org/handbook/modules/forum/')) .'
'; return $output; case 'admin/content/forum': - return t('This is a list of existing containers and forums that you can edit. Containers hold forums and, in turn, forums hold threaded discussions. Both containers and forums can be placed inside other containers and forums. By planning the structure of your containers and forums well, you make it easier for users to find a topic area of interest to them.
'); + return ''. t('This is a list of existing containers and forums that you can edit. Containers hold forums and, in turn, forums hold threaded discussions. Both containers and forums can be placed inside other containers and forums. By planning the structure of your containers and forums well, you make it easier for users to find a topic area of interest to them.') .'
'; case 'admin/content/forum/add/container': - return t('Containers help you organize your forums. The job of a container is to hold, or contain, other forums that are related. For example, a container named "Food" might hold two forums named "Fruit" and "Vegetables".
'); + return ''. t('Containers help you organize your forums. The job of a container is to hold, or contain, other forums that are related. For example, a container named "Food" might hold two forums named "Fruit" and "Vegetables".') .'
'; case 'admin/content/forum/add/forum': - return t('A forum holds discussion topics that are related. For example, a forum named "Fruit" might contain topics titled "Apples" and "Bananas".
'); + return ''. t('A forum holds discussion topics that are related. For example, a forum named "Fruit" might contain topics titled "Apples" and "Bananas".') .'
'; } } @@ -606,7 +606,7 @@ function forum_overview() { } } else { - $rows[] = array(array('data' => '' . t('There are no existing containers or forums. You may add some on the add container or add forum pages.', array('@container' => url('admin/content/forum/add/container'), '@forum' => url('admin/content/forum/add/forum'))) . '', 'colspan' => 2)); + $rows[] = array(array('data' => ''. t('There are no existing containers or forums. You may add some on the add container or add forum pages.', array('@container' => url('admin/content/forum/add/container'), '@forum' => url('admin/content/forum/add/forum'))) .'', 'colspan' => 2)); } return theme('table', $header, $rows); } Index: modules/help/help.module =================================================================== RCS file: /cvs/drupal/drupal/modules/help/help.module,v retrieving revision 1.61 diff -u -p -r1.61 help.module --- modules/help/help.module 22 Oct 2006 08:28:45 -0000 1.61 +++ modules/help/help.module 16 Nov 2006 05:37:26 -0000 @@ -41,7 +41,7 @@ function help_menu($may_cache) { * Menu callback; prints a page listing a glossary of Drupal terminology. */ function help_main() { - $output = t(" + $output = t('Help is available on the following items:
!help_pages @@ -59,12 +59,12 @@ function help_main() {'. t('The help module displays context sensitive help information. Users can learn how to use modules and accomplish tasks quicker with less errors by clicking on links in provided by the help module.') .'
'; - $output .= t('Modules can make documentation available to other modules with this module. All user help should be presented using this module. Some examples of help:
+ $output .= t("Modules can make documentation available to other modules with this module. All user help should be presented using this module. Some examples of help:
'. t('You can not administer the help system.') .'
'; $output .= ''. t('For more information please read the configuration and customization handbook Help page.', array('@help' => 'http://drupal.org/handbook/modules/help/')) .'
'; return $output; Index: modules/locale/locale.module =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.module,v retrieving revision 1.148 diff -u -p -r1.148 locale.module --- modules/locale/locale.module 23 Oct 2006 21:04:12 -0000 1.148 +++ modules/locale/locale.module 16 Nov 2006 05:37:26 -0000 @@ -19,9 +19,9 @@ function locale_help($section) { switch ($section) { 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 web site 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 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('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("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('You can
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/settings/locale/string/search"), "@import" => url("admin/settings/locale/language/import"), "@add-language" => url("admin/settings/locale/language/add"))); + 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/settings/locale/string/search"), "@import" => url("admin/settings/locale/language/import"), "@add-language" => url("admin/settings/locale/language/add"))) .'
'; case 'admin/settings/locale/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/settings/locale/language/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 standardised for the desired language. You can also add a language by importing a translation.', array("@import" => url("admin/settings/locale/language/import"))) .'
'; case 'admin/settings/locale/language/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')); + 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/settings/locale/language/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.
"); + 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/settings/locale/string/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/settings/locale/language/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 untranslated strings, and the default English texts provided by Drupal.', array("@export" => url("admin/settings/locale/language/export"))) .'
'; } } Index: modules/menu/menu.module =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v retrieving revision 1.94 diff -u -p -r1.94 menu.module --- modules/menu/menu.module 10 Nov 2006 08:34:07 -0000 1.94 +++ modules/menu/menu.module 16 Nov 2006 05:37:27 -0000 @@ -49,7 +49,7 @@ function menu_menu($may_cache) { if ($may_cache) { $items[] = array('path' => 'admin/build/menu', 'title' => t('Menus'), - 'description' => t('Control your site\'s navigation menu, create menu blocks, as well as rename and reorganize menu items.'), + 'description' => t("Control your site's navigation menu, create menu blocks, as well as rename and reorganize menu items."), 'callback' => 'menu_overview', 'access' => user_access('administer menu')); $items[] = array('path' => 'admin/build/menu/list', Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.727 diff -u -p -r1.727 node.module --- modules/node/node.module 12 Nov 2006 19:56:07 -0000 1.727 +++ modules/node/node.module 16 Nov 2006 05:37:29 -0000 @@ -34,7 +34,7 @@ function node_help($section) { $output .= ''. t('For more information please read the configuration and customization handbook Node page.', array('@node' => 'http://drupal.org/handbook/modules/node/')) .'
'; return $output; case 'admin/content/search': - return t('Enter a simple pattern to search for a post. Words are matched exactly. Phrases can be surrounded by quotes to do an exact search.
'); + return ''. t('Enter a simple pattern to search for a post. Words are matched exactly. Phrases can be surrounded by quotes to do an exact search.') .'
'; case 'admin/content/types': return ''. t('Below is a list of all the content types on your site. All posts that exist on your site are instances of one of these content types.') .'
'; case 'admin/content/types/add': @@ -1043,7 +1043,7 @@ function node_menu($may_cache) { if ($may_cache) { $items[] = array('path' => 'admin/content', 'title' => t('Content management'), - 'description' => t('Manage your site\'s content.'), + 'description' => t("Manage your site's content."), 'position' => 'left', 'weight' => -10, 'callback' => 'system_admin_menu_block_page', @@ -1053,7 +1053,7 @@ function node_menu($may_cache) { $items[] = array( 'path' => 'admin/content/node', 'title' => t('Posts'), - 'description' => t('View, edit, and delete your site\'s content.'), + 'description' => t("View, edit, and delete your site's content."), 'callback' => 'node_admin_content', 'access' => user_access('administer nodes') ); @@ -1390,7 +1390,7 @@ function theme_node_filters($form) { $output .= ''. t('For more information please read the configuration and customization handbook Path page.', array('@path' => 'http://drupal.org/handbook/modules/path/')) .'
'; return $output; case 'admin/build/path': - return t("Drupal provides users complete control over URLs through aliasing. This feature is typically used to make URLs human-readable or easy to remember. For example, one could map the relative URL 'node/1' onto 'about'. Each system path can have multiple aliases.
"); + return ''. t("Drupal provides users complete control over URLs through aliasing. This feature is typically used to make URLs human-readable or easy to remember. For example, one could map the relative URL 'node/1' onto 'about'. Each system path can have multiple aliases.") .'
'; case 'admin/build/path/add': - return t('Enter the path you wish to create the alias for, followed by the name of the new alias.
'); + return ''. t('Enter the path you wish to create the alias for, followed by the name of the new alias.') .'
'; } } @@ -49,7 +49,7 @@ function path_menu($may_cache) { if ($may_cache) { $items[] = array('path' => 'admin/build/path', 'title' => t('URL aliases'), - 'description' => t('Change your site\'s URL paths by aliasing them.'), + 'description' => t("Change your site's URL paths by aliasing them."), 'callback' => 'path_admin', 'access' => user_access('administer url aliases')); $items[] = array('path' => 'admin/build/path/edit', 'title' => t('Edit alias'), Index: modules/profile/profile.module =================================================================== RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v retrieving revision 1.178 diff -u -p -r1.178 profile.module --- modules/profile/profile.module 12 Nov 2006 19:33:30 -0000 1.178 +++ modules/profile/profile.module 16 Nov 2006 05:37:30 -0000 @@ -41,7 +41,7 @@ function profile_help($section) { $output .= ''. t('For more information please read the configuration and customization handbook Profile page.', array('@profile' => 'http://drupal.org/handbook/modules/profile/')) .'
'; return $output; case 'admin/user/profile': - return t('Here you can define custom fields that users can fill in in their user profile (such as country, real name, age, ...).
'); + return ''. t('Here you can define custom fields that users can fill in in their user profile (such as country, real name, age, ...).') .'
'; } } @@ -148,7 +148,7 @@ function profile_block($op = 'list', $de } if (isset($use_fields['user_profile']) && $use_fields['user_profile']) { - $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 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('You can
'. 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 behaviour. Note that the search requires cron to be set up correctly. +") .'
'; case 'search#noresults': return t('Changing the settings below will cause the site index to be rebuilt. The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed.
The default settings should be appropriate for the majority of sites.
') .''); + $form['indexing_settings']['info'] = array('#value' => ''. t("Changing the settings below will cause the site index to be rebuilt. The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won't be indexed until all existing content has been re-indexed.
The default settings should be appropriate for the majority of sites.") .'
'); $form['indexing_settings']['minimum_word_size'] = array('#type' => 'textfield', '#title' => t('Minimum word length to index'), '#default_value' => variable_get('minimum_word_size', 3), '#size' => 5, '#maxlength' => 3, '#description' => t('The number of characters a word has to be to be indexed. A lower setting means better search result ranking, but also a larger database. Each search query must contain at least one keyword that is this size (or longer).')); $form['indexing_settings']['overlap_cjk'] = array('#type' => 'checkbox', '#title' => t('Simple CJK handling'), '#default_value' => variable_get('overlap_cjk', TRUE), '#description' => t('Whether to apply a simple Chinese/Japanese/Korean tokenizer based on overlapping sequences. Turn this off if you want to use an external preprocessor for this instead. Does not affect other languages.')); @@ -254,7 +253,7 @@ function search_admin_settings() { */ function search_wipe_confirm() { return confirm_form(array(), t('Are you sure you want to re-index the site?'), - 'admin/settings/search', t(' The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won\'t be indexed until all existing content has been re-indexed. This action cannot be undone.'), t('Re-index site'), t('Cancel')); + 'admin/settings/search', t(" The search index is not cleared but systematically updated to reflect the new settings. Searching will continue to work but new content won't be indexed until all existing content has been re-indexed. This action cannot be undone."), t('Re-index site'), t('Cancel')); } /** Index: modules/statistics/statistics.module =================================================================== RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v retrieving revision 1.242 diff -u -p -r1.242 statistics.module --- modules/statistics/statistics.module 22 Oct 2006 08:28:46 -0000 1.242 +++ modules/statistics/statistics.module 16 Nov 2006 05:37:31 -0000 @@ -13,24 +13,24 @@ function statistics_help($section) { switch ($section) { case 'admin/help#statistics': $output = ''. t('The statistics module keeps track of numerous statistics of site usage. It counts how many times, and from where each of your posts is viewed. The statistics module can be used to learn many useful things about how users are interacting with each other and with your site.') .'
'; - $output .= t('Statistics module features
+ $output .= t("Statistics module features
Configuring the statistics module
+"); + $output .= t("Configuring the statistics module
You can
'. t('For more information please read the configuration and customization handbook Statistics page.', array('@statistics' => 'http://drupal.org/handbook/modules/statistics/')) .'
'; return $output; case 'admin/logs/settings': - return t('Settings for the statistical information that Drupal will keep about the site. See site statistics for the actual information.
', array('@statistics' => url('admin/logs/hits'))); + return ''. t('Settings for the statistical information that Drupal will keep about the site. See site statistics for the actual information.', array('@statistics' => url('admin/logs/hits'))) .'
'; case 'admin/logs/hits': - return t('This page shows you the most recent hits.
'); + return ''. t('This page shows you the most recent hits.') .'
'; case 'admin/logs/referrers': - return t('This page shows you all external referrers. These are links pointing to your web site from outside your web site.
'); + return ''. t('This page shows you all external referrers. These are links pointing to your website from outside your website.') .'
'; case 'admin/logs/visitors': - return 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.
"); + return ''. 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.") .'
'; } } Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.396 diff -u -p -r1.396 system.module --- modules/system/system.module 13 Nov 2006 20:26:00 -0000 1.396 +++ modules/system/system.module 16 Nov 2006 05:37:33 -0000 @@ -16,9 +16,9 @@ function system_help($section) { switch ($section) { case 'admin/help#system': - $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 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.') .'
'; + $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 settings module provides control over preferences, behaviours 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("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('You can
'. t('For more information please read the configuration and customization handbook System page.', array('@system' => 'http://drupal.org/handbook/modules/system/')) .'
'; return $output; case 'admin': - return t('Welcome to the administration section. Here you may control how your site functions.
'); + return ''. t('Welcome to the administration section. Here you may control how your site functions.') .'
'; case 'admin/by-module': - return t('This page shows you all available administration tasks for each module.
'); + return ''. t('This page shows you all available administration tasks for each module.') .'
'; case 'admin/settings/page-caching': return t('Enabling the cache will offer a sufficient performance boost. Drupal can store and send compressed cached pages requested by "anonymous" users. By caching a web page, Drupal does not have to create the page each time someone wants to view it.'); 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. 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.') .'
'; 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.
'); + 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/themes/settings/'. arg(3): $reference = explode('.', arg(3), 2); $theme = array_pop($reference); - return t('These options control the display settings for the %template theme. When your site is displayed using this theme, these settings will be used. By clicking "Reset to defaults," you can choose to use the global settings for this theme.
'. t('These options control the display settings for the %template theme. When your site is displayed using this theme, these settings will be used. By clicking "Reset to defaults," you can choose to use the global settings for this theme.', array('%template' => $theme, '@global' => url('admin/build/themes/settings'))) .'
Modules are plugins for Drupal that extend its core functionality. Here you can select which modules are enabled. Click on the name of the module in the navigation menu for their individual configuration pages. 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. The auto-throttle functionality must be enabled on the throttle configuration page after having enabled the throttle module.
It is important that update.php is run every time a module is updated to a newer version.
You can find all administration tasks belonging to a particular module on the administration by module page.
', array('@permissions' => url('admin/user/access'), '@throttle' => url('admin/settings/throttle'), '@update-php' => $base_url .'/update.php', '@by-module' => url('admin/by-module'))); case 'admin/build/modules/uninstall': - return (t('The uninstall process removes all data related to a module. To uninstall a module, you must first disable it. Not all modules support this feature.
')); + return ''. t('The uninstall process removes all data related to a module. To uninstall a module, you must first disable it. Not all modules support this feature.') .'
'; case 'admin/logs/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 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.") .'
'; } } @@ -264,7 +264,7 @@ function system_menu($may_cache) { $items[] = array( 'path' => 'admin/settings/date-time', 'title' => t('Date and time'), - 'description' => t('Settings for how Drupal displays date and time, as well as the system\'s default timezone.'), + 'description' => t("Settings for how Drupal displays date and time, as well as the system's default timezone."), 'callback' => 'drupal_get_form', 'callback arguments' => array('system_date_time_settings')); $items[] = array( @@ -292,7 +292,7 @@ function system_menu($may_cache) { $items[] = array( 'path' => 'admin/logs/status', 'title' => t('Status report'), - 'description' => t('Get a status report about your site\'s operation and any detected problems.'), + 'description' => t("Get a status report about your site's operation and any detected problems."), 'callback' => 'system_status', 'weight' => 10, 'access' => $access); @@ -500,7 +500,7 @@ function system_theme_select_form($descr $screenshot = file_exists($info->screenshot) ? theme('image', $info->screenshot, t('Screenshot for %theme theme', array('%theme' => $info->name)), '', array('class' => 'screenshot'), FALSE) : t('no screenshot'); $form['themes'][$info->key]['screenshot'] = array('#value' => $screenshot); - $form['themes'][$info->key]['description'] = array('#type' => 'item', '#title' => $info->name, '#value' => dirname($info->filename) . ($info->name == variable_get('theme_default', 'garland') ? t(''. t("The following enabled modules are incompatible with aggressive mode caching and will not function properly: %modules", array('%modules' => implode(', ', $problem_modules))) .'.
'; + $description .= ''. t("The following enabled modules are incompatible with aggressive mode caching and will not function properly: %modules.", array('%modules' => implode(', ', $problem_modules))) .'
'; } else { - $description .= ''. t("Currently, all enabled modules are compatible with the aggressive caching policy. Please note, if you use aggressive caching and enable new modules, you'll need to check this page again to ensure compatibility.") .'
'; + $description .= ''. t('Currently, all enabled modules are compatible with the aggressive caching policy. Please note, if you use aggressive caching and enable new modules, you will need to check this page again to ensure compatibility.') .'
'; } $form['cache'] = array( @@ -2011,7 +2011,7 @@ function system_theme_settings($key = '' // Icon settings if ((!$key) || in_array('toggle_favicon', $features)) { $form['favicon'] = array('#type' => 'fieldset', '#title' => t('Shortcut icon settings')); - $form['favicon']['text'] = array('#value' => t('Your shortcut icon or \'favicon\' is displayed in the address bar and bookmarks of most browsers.')); + $form['favicon']['text'] = array('#value' => t("Your shortcut icon or 'favicon' is displayed in the address bar and bookmarks of most browsers.")); $form['favicon']['default_favicon'] = array( '#type' => 'checkbox', '#title' => t('Use the default shortcut icon.'), @@ -2133,7 +2133,7 @@ function theme_admin_page($blocks) { $output .= l(t('Show descriptions'), 'admin/compact/off', array('title' => t('Produce a less compact layout that includes descriptions.'))); } else { - $output .= l(t('Hide descriptions'), 'admin/compact/on', array('title' => t('Produce a more compact layout that doesn\'t include descriptions.'))); + $output .= l(t('Hide descriptions'), 'admin/compact/on', array('title' => t("Produce a more compact layout that doesn't include descriptions."))); } $output .= ''; Index: modules/taxonomy/taxonomy.module =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v retrieving revision 1.323 diff -u -p -r1.323 taxonomy.module --- modules/taxonomy/taxonomy.module 10 Nov 2006 19:40:23 -0000 1.323 +++ modules/taxonomy/taxonomy.module 16 Nov 2006 05:37:34 -0000 @@ -1387,7 +1387,7 @@ function taxonomy_help($section) { case 'admin/help#taxonomy': $output = ''. t('The taxonomy module is one of the most popular features because users often want to create categories to organize content by type. It can automatically classify new content, which is very useful for organizing content on-the-fly. A simple example would be organizing a list of music reviews by musical genre.') .'
'; $output .= ''. t('Taxonomy is also the study of classification. The taxonomy module allows you to define vocabularies (sets of categories) which are used to classify content. The module supports hierarchical classification and association between terms, allowing for truly flexible information retrieval and classification. The taxonomy module allows multiple lists of categories for classification (controlled vocabularies) and offers the possibility of creating thesauri (controlled vocabularies that indicate the relationship of terms) and taxonomies (controlled vocabularies where relationships are indicated hierarchically). To view and manage the terms of each vocabulary, click on the associated list terms link. To delete a vocabulary and all its terms, choose edit vocabulary.') .'
'; - $output .= ''. t('A controlled vocabulary is a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each piece of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slashdot\'s sections. For more complex implementations, you might create a hierarchical list of categories.') .'
'; + $output .= ''. t("A controlled vocabulary is a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each piece of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slashdot's sections. For more complex implementations, you might create a hierarchical list of categories.") .'
'; $output .= t('You can
'. t('For more information please read the configuration and customization handbook Taxonomy page.', array('@taxonomy' => 'http://drupal.org/handbook/modules/taxonomy/')) .'
'; return $output; case 'admin/content/taxonomy': - return t('The taxonomy module allows you to classify content into categories and subcategories; it allows multiple lists of categories for classification (controlled vocabularies) and offers the possibility of creating thesauri (controlled vocabularies that indicate the relationship of terms), taxonomies (controlled vocabularies where relationships are indicated hierarchically), and free vocabularies where terms, or tags, are defined during content creation. To view and manage the terms of each vocabulary, click on the associated list terms link. To delete a vocabulary and all its terms, choose "edit vocabulary".
'); + return ''. t('The taxonomy module allows you to classify content into categories and subcategories; it allows multiple lists of categories for classification (controlled vocabularies) and offers the possibility of creating thesauri (controlled vocabularies that indicate the relationship of terms), taxonomies (controlled vocabularies where relationships are indicated hierarchically), and free vocabularies where terms, or tags, are defined during content creation. To view and manage the terms of each vocabulary, click on the associated list terms link. To delete a vocabulary and all its terms, choose "edit vocabulary".') .'
'; case 'admin/content/taxonomy/add/vocabulary': - return t("When you create a controlled vocabulary you are creating a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each piece of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slashdot.org's or Kuro5hin.org's sections. For more complex implementations, you might create a hierarchical list of categories.
"); + return ''. t("When you create a controlled vocabulary you are creating a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each piece of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slashdot.org's or Kuro5hin.org's sections. For more complex implementations, you might create a hierarchical list of categories.") .'
'; } } Index: modules/tracker/tracker.module =================================================================== RCS file: /cvs/drupal/drupal/modules/tracker/tracker.module,v retrieving revision 1.137 diff -u -p -r1.137 tracker.module --- modules/tracker/tracker.module 22 Oct 2006 08:28:46 -0000 1.137 +++ modules/tracker/tracker.module 16 Nov 2006 05:37:35 -0000 @@ -13,7 +13,7 @@ function tracker_help($section) { switch ($section) { case 'admin/help#tracker': $output = ''. t('The tracker module displays the most recently added or updated content to the website allowing users to see the most recent contributions. The tracker module provides user level tracking for those who like to follow the contributions of particular authors.') .'
'; - $output .= ''. t('The "recent posts" page is available via a link in the navigation menu block and contains a reverse chronological list of new and recently-updated content. The table displays the content type, the title, the author\'s name, how many comments that item has received, and when it was last updated. Updates include any changes to the text, either by the original author or someone else, as well as any new comments added to an item. To use the tracker module to watch for a user\'s updated content, click on that user\'s profile, then the track tab.') .'
'; + $output .= ''. t("The "recent posts" page is available via a link in the navigation menu block and contains a reverse chronological list of new and recently-updated content. The table displays the content type, the title, the author's name, how many comments that item has received, and when it was last updated. Updates include any changes to the text, either by the original author or someone else, as well as any new comments added to an item. To use the tracker module to watch for a user's updated content, click on that user's profile, then the track tab.") .'
'; $output .= t('You can
'. t('For more information please read the configuration and customization handbook Upload page.', array('@upload' => 'http://drupal.org/handbook/modules/upload/')) .'
'; return $output; case 'admin/settings/upload': - return t('Users with the upload files permission can upload attachments. Users with the view uploaded files permission can view uploaded attachments. You can choose which post types can take attachments on the content types settings page.
', array('@permissions' => url('admin/user/access'), '@types' => url('admin/settings/types'))); + return ''. t('Users with the upload files permission can upload attachments. Users with the view uploaded files permission can view uploaded attachments. You can choose which post types can take attachments on the content types settings page.', array('@permissions' => url('admin/user/access'), '@types' => url('admin/settings/types'))) .'
'; } } @@ -181,7 +181,7 @@ function upload_admin_settings() { '#size' => 15, '#maxlength' => 10, '#description' => t('The maximum allowed image size (e.g. 640x480). Set to 0 for no restriction.'), - '#field_suffix' => t('WIDTHxHEIGHT') + '#field_suffix' => ''. t('WIDTHxHEIGHT') .'' ); $form['settings_general']['upload_list_default'] = array( '#type' => 'select', Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.709 diff -u -p -r1.709 user.module --- modules/user/user.module 15 Nov 2006 20:18:28 -0000 1.709 +++ modules/user/user.module 16 Nov 2006 05:37:38 -0000 @@ -508,8 +508,8 @@ function user_block($op = 'list', $delta if ($op == 'list') { $blocks[0]['info'] = t('User login'); $blocks[1]['info'] = t('Navigation'); - $blocks[2]['info'] = t('Who\'s new'); - $blocks[3]['info'] = t('Who\'s online'); + $blocks[2]['info'] = t("Who's new"); + $blocks[3]['info'] = t("Who's online"); return $blocks; } @@ -565,7 +565,7 @@ function user_block($op = 'list', $delta } $output = theme('user_list', $items); - $block['subject'] = t('Who\'s new'); + $block['subject'] = t("Who's new"); $block['content'] = $output; } return $block; @@ -601,7 +601,7 @@ function user_block($op = 'list', $delta $output .= theme('user_list', $items, t('Online users')); } - $block['subject'] = t('Who\'s online'); + $block['subject'] = t("Who's online"); $block['content'] = $output; } return $block; @@ -619,7 +619,7 @@ function theme_user_picture($account) { } if (isset($picture)) { - $alt = t('@user\'s picture', array('@user' => $account->name ? $account->name : variable_get('anonymous', 'Anonymous'))); + $alt = t("@user's picture", array('@user' => $account->name ? $account->name : variable_get('anonymous', t('Anonymous')))); $picture = theme('image', $picture, $alt, $alt, '', FALSE); if (!empty($account->uid) && user_access('access user profiles')) { $picture = l($picture, "user/$account->uid", array('title' => t('View user profile.')), NULL, NULL, FALSE, TRUE); @@ -713,7 +713,7 @@ function user_menu($may_cache) { // Admin user pages $items[] = array('path' => 'admin/user', 'title' => t('User management'), - 'description' => t('Manage your site\'s users, groups and access to site features.'), + 'description' => t("Manage your site's users, groups and access to site features."), 'position' => 'left', 'callback' => 'system_admin_menu_block_page', 'access' => user_access('administer site configuration'), @@ -1115,7 +1115,7 @@ function user_pass_reset($uid, $timestam } else { $form['message'] = array('#value' => t('This is a one-time login for %user_name and will expire on %expiration_date
Click on this button to login to the site and change your password.
', array('%user_name' => $account->name, '%expiration_date' => format_date($timestamp + $timeout)))); - $form['help'] = array('#value' => t('This login can be used only once.
')); + $form['help'] = array('#value' => ''. t('This login can be used only once.') .'
'); $form['submit'] = array('#type' => 'submit', '#value' => t('Log in')); $form['#action'] = url("user/reset/$uid/$timestamp/$hashed_pass/login"); return $form; @@ -2260,7 +2260,7 @@ function user_admin_settings() { $form['pictures']['user_picture_default'] = array('#type' => 'textfield', '#title' => t('Default picture'), '#default_value' => variable_get('user_picture_default', ''), '#size' => 30, '#maxlength' => 255, '#description' => t('URL of picture to display for users with no custom picture selected. Leave blank for none.')); $form['pictures']['user_picture_dimensions'] = array('#type' => 'textfield', '#title' => t('Picture maximum dimensions'), '#default_value' => variable_get('user_picture_dimensions', '85x85'), '#size' => 15, '#maxlength' => 10, '#description' => t('Maximum dimensions for pictures, in pixels.')); $form['pictures']['user_picture_file_size'] = array('#type' => 'textfield', '#title' => t('Picture maximum file size'), '#default_value' => variable_get('user_picture_file_size', '30'), '#size' => 15, '#maxlength' => 10, '#description' => t('Maximum file size for pictures, in kB.')); - $form['pictures']['user_picture_guidelines'] = array('#type' => 'textarea', '#title' => t('Picture guidelines'), '#default_value' => variable_get('user_picture_guidelines', ''), '#description' => t('This text is displayed at the picture upload form in addition to the default guidelines. It\'s useful for helping or instructing your users.')); + $form['pictures']['user_picture_guidelines'] = array('#type' => 'textarea', '#title' => t('Picture guidelines'), '#default_value' => variable_get('user_picture_guidelines', ''), '#description' => t("This text is displayed at the picture upload form in addition to the default guidelines. It's useful for helping or instructing your users.")); return system_settings_form($form); } @@ -2298,7 +2298,7 @@ function user_help($section) { switch ($section) { 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('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("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('You can
'. t('For more information please read the configuration and customization handbook User page.', array('@user' => 'http://drupal.org/handbook/modules/user/')) .'
'; return $output; case 'admin/user/user': - return t('Drupal allows users to register, login, log out, maintain user profiles, etc. Users of the site may not use their own names to post content until they have signed up for a user account.
'); + return ''. t('Drupal allows users to register, login, log out, maintain user profiles, etc. Users of the site may not use their own names to post content until they have signed up for a user account.') .'
'; case 'admin/user/user/create': case 'admin/user/user/account/create': - return t('This web page allows the administrators to register a new users by hand. Note that you cannot have a user where either the e-mail address or the username match another user in the system.
'); + return ''. t('This web page allows the administrators to register new users by hand. Note that you cannot have a user where either the e-mail address or the username match another user in the system.') .'
'; case 'admin/user/rules': - return t('Set up username and e-mail address access rules for new and existing accounts (currently logged in accounts will not be logged out). If a username or e-mail address for an account matches any deny rule, but not an allow rule, then the account will not be allowed to be created or to log in. A host rule is effective for every page view, not just registrations.
'); + return ''. t('Set up username and e-mail address access rules for new and existing accounts (currently logged in accounts will not be logged out). If a username or e-mail address for an account matches any deny rule, but not an allow rule, then the account will not be allowed to be created or to log in. A host rule is effective for every page view, not just registrations.') .'
'; case 'admin/user/access': - return t('Permissions let you control what users can do on your site. Each user role (defined on the user roles page) has its own set of permissions. For example, you could give users classified as "Administrators" permission to "administer nodes" but deny this power to ordinary, "authenticated" users. You can use permissions to reveal new features to privileged users (those with subscriptions, for example). Permissions also allow trusted users to share the administrative burden of running a busy site.
', array('@role' => url('admin/user/roles'))); + return ''. t('Permissions let you control what users can do on your site. Each user role (defined on the user roles page) has its own set of permissions. For example, you could give users classified as "Administrators" permission to "administer nodes" but deny this power to ordinary, "authenticated" users. You can use permissions to reveal new features to privileged users (those with subscriptions, for example). Permissions also allow trusted users to share the administrative burden of running a busy site.', array('@role' => url('admin/user/roles'))) .'
'; case 'admin/user/roles': return 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 in user permissions. Examples of roles include: anonymous user, authenticated user, moderator, administrator and so on. In this area you will define the role names of the various roles. To delete a role choose "edit".
By default, Drupal comes with two user roles:
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".
'); + return ''. t('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".') .'
'; case 'user/help#user': - $site = variable_get('site_name', 'this website'); + $site = variable_get('site_name', t('this website')); $affiliates = user_auth_help_links(); if (count($affiliates)) { Index: modules/watchdog/watchdog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/watchdog/watchdog.module,v retrieving revision 1.158 diff -u -p -r1.158 watchdog.module --- modules/watchdog/watchdog.module 22 Oct 2006 08:28:47 -0000 1.158 +++ modules/watchdog/watchdog.module 16 Nov 2006 05:37:39 -0000 @@ -29,7 +29,7 @@ function watchdog_help($section) { $output .= ''. t('For more information please read the configuration and customization handbook Watchdog page.', array('@watchdog' => 'http://drupal.org/handbook/modules/watchdog/')) .'
'; return $output; case 'admin/logs': - return 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.
'); + return ''. 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.') .'
'; } } Index: themes/chameleon/chameleon.theme =================================================================== RCS file: /cvs/drupal/drupal/themes/chameleon/chameleon.theme,v retrieving revision 1.54 diff -u -p -r1.54 chameleon.theme --- themes/chameleon/chameleon.theme 23 Oct 2006 21:06:19 -0000 1.54 +++ themes/chameleon/chameleon.theme 16 Nov 2006 05:37:39 -0000 @@ -35,7 +35,7 @@ function chameleon_page($content, $show_ $output = "\n"; $output .= "\n"; $output .= "\n"; - $output .= "