Index: xmlsitemap.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap.install,v retrieving revision 1.5.2.24 diff -u -r1.5.2.24 xmlsitemap.install --- xmlsitemap.install 18 Dec 2008 22:28:37 -0000 1.5.2.24 +++ xmlsitemap.install 20 Dec 2008 12:41:32 -0000 @@ -17,25 +17,25 @@ */ function xmlsitemap_schema() { $schema['xmlsitemap'] = array( - 'description' => t('The base table for xmlsitemap.'), + 'description' => 'The base table for xmlsitemap.', 'fields' => array( 'loc' => array( - 'description' => t('The path of this node.'), + 'description' => 'The path of this node.', 'type' => 'varchar', 'length' => 255, 'not null' => TRUE, 'default' => '', ), 'lastmod' => array( - 'description' => t('Last change time.'), + 'description' => 'Last change time.', 'type' => 'int', ), 'changefreq' => array( - 'description' => t('The frequency of the changes.'), + 'description' => 'The frequency of the changes.', 'type' => 'int', ), 'priority' => array( - 'description' => t('The priority of this node in the sitemap.'), + 'description' => 'The priority of this node in the sitemap.', 'type' => 'float', ), ), Index: xmlsitemap.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap.module,v retrieving revision 1.20.2.27 diff -u -r1.20.2.27 xmlsitemap.module --- xmlsitemap.module 18 Dec 2008 22:28:37 -0000 1.20.2.27 +++ xmlsitemap.module 20 Dec 2008 12:41:32 -0000 @@ -40,38 +40,38 @@ switch ($path) { case 'admin/settings/xmlsitemap': case 'admin/settings/xmlsitemap/settings': - $output = t('Configure the site map. Your site map is at !url.', array('!url' => l(xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE), xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE)))); + $output = t('Configure the site map. Your site map is at @xmlsitemap-url.', array('@xmlsitemap-url' => xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE)); break; case 'admin/settings/xmlsitemap/engines': $output = t('Configure behavior for search engines.'); break; case 'admin/help#xmlsitemap': - $output = '

'. t('XML Sitemap automatically creates a site map that conforms to the !sitemaps.org specification. This helps search engines keep their search results up to date.', array('!sitemaps.org' => l('sitemaps.org', 'http://www.sitemaps.org'))) ."

\n"; - $output .= '

'. t('Your site map is at !sitemap.xml.', array('!sitemap.xml' => l(xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE), xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE)))) .'

'; + $output = '

'. t('XML Sitemap automatically creates a site map that conforms to the sitemaps.org specification. This helps search engines keep their search results up to date.', array('@sitemaps-org' => 'http://www.sitemaps.org')) ."

\n"; + $output .= '

'. t('Your site map is at @xmlsitemap-url.', array('@xmlsitemap-url' => xmlsitemap_url('sitemap.xml', drupal_lookup_path('alias', 'sitemap.xml') ? drupal_lookup_path('alias', 'sitemap.xml') : NULL, NULL, NULL, TRUE))) .'

'; $output .= '

'. t('Supporting modules') ."

\n"; $output .= '

'. t('By itself, the XML Sitemap module adds only the front page of your site to the site map. Other types of links are handled by supporting modules.') ."

\n"; $optional = ''; if (module_exists('xmlsitemap_menu')) { $optional .= '
'. t('XML Sitemap: Menu') ."
\n"; - $optional .= '
'. t('XML Sitemap: Menu allows menu items to be added to the site map. You can choose the menus to include on the XML Sitemap administration page and can add and remove menu items on the !menu administration page. The priority of a menu item is determined by its weight.', array('!menu administration' => l('menu administration', 'admin/build/menu'))) ."
\n"; + $optional .= '
'. t('XML Sitemap: Menu allows menu items to be added to the site map. You can choose the menus to include on the XML Sitemap administration page and can add and remove menu items on the menu administration page. The priority of a menu item is determined by its weight.', array('@menu-administration' => url('admin/build/menu'))) ."
\n"; } if (module_exists('xmlsitemap_node')) { $optional .= '
'. t('XML Sitemap: Node') ."
\n"; - $optional .= '
'. t('XML Sitemap: Node adds nodes (content) to the site map. The default priority of a node is determined by a combination of its !content type priority, whether it appears on the front page of your site, and the number of comments it has received. You can override the default priority for individual nodes when you add or edit a node.', array('!content type' => l('content type', 'admin/content/types'))) ."
\n"; + $optional .= '
'. t('XML Sitemap: Node adds nodes (content) to the site map. The default priority of a node is determined by a combination of its content type priority, whether it appears on the front page of your site, and the number of comments it has received. You can override the default priority for individual nodes when you add or edit a node.', array('@content type' => url('admin/content/types'))) ."
\n"; } if (module_exists('xmlsitemap_term')) { $optional .= '
'. t('XML Sitemap: Term') ."
\n"; - $optional .= '
'. t('XML Sitemap: Term adds !taxonomy terms (categories) to the site map. You can change the default priority when you add or edit a vocabulary, and you can override the default priority when you add or edit individual terms.', array('!taxonomy terms' => l('taxonomy terms', 'admin/content/taxonomy'))) ."
\n"; + $optional .= '
'. t('XML Sitemap: Term adds taxonomy terms (categories) to the site map. You can change the default priority when you add or edit a vocabulary, and you can override the default priority when you add or edit individual terms.', array('@taxonomy-terms' => url('admin/content/taxonomy'))) ."
\n"; } if (module_exists('xmlsitemap_user')) { $optional .= '
'. t('XML Sitemap: User') ."
\n"; - $optional .= '
'. t('XML Sitemap: User adds user profiles to the site map. The anonymous user role must be given permission to access user profiles on the !access control page. You can change the default user priority on the !user settings page. The !user role priority will override the default user priority. You can override both the default priority and the role priority when you add or edit a user.', array('!access control' => l('access control', 'admin/user/access'), '!user settings' => l('user settings', 'admin/user/settings'), '!user role' => l('user role', 'admin/user/roles'))) ."
\n"; + $optional .= '
'. t('XML Sitemap: User adds user profiles to the site map. The anonymous user role must be given permission to access user profiles on the access control page. You can change the default user priority on the user settings page. The user role priority will override the default user priority. You can override both the default priority and the role priority when you add or edit a user.', array('@access-control' => url('admin/user/access'), '@user-settings' => url('admin/user/settings'), '@user-role' => url('admin/user/roles'))) ."
\n"; } if (!empty($optional)) { $output .= "
\n$optional
\n"; } $output .= '

'. t('Links may be assigned a priority between 0.0 and 1.0. The default priority is 0.5. A priority of Not in site map excludes a link from the site map.') .'

'; - $output .= '

'. t('More information is available in the !XML Sitemap documentation.', array('!sitemaps.org' => l('sitemaps.org', 'http://www.sitemaps.org'), '!XML Sitemap documentation' => l('XML Sitemap documentation', 'http://drupal.org/handbook/modules/gsitemap'))) ."

\n"; + $output .= '

'. t('More information is available in the XML Sitemap documentation.', array('@link' => 'http://drupal.org/handbook/modules/gsitemap')) ."

\n"; break; default: $output = ''; @@ -130,8 +130,8 @@ if ($links_count / $chunk_size > 1 || !empty($xml)) { for ($chunk = 0; $chunk < $links_count / $chunk_size + count(_xmlsitemap_xml()); ++$chunk) { $items["sitemap$chunk.xml"] = array( - 'title' => 'Site map !number', - 'title arguments' => array('!number' => $chunk), + 'title' => 'Site map @number', + 'title arguments' => array('@number' => $chunk), 'page callback' => 'xmlsitemap_output', 'page arguments' => array((string)$chunk), 'access arguments' => $access_content, Index: xmlsitemap_node/xmlsitemap_node.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_node/xmlsitemap_node.module,v retrieving revision 1.19.2.14 diff -u -r1.19.2.14 xmlsitemap_node.module --- xmlsitemap_node/xmlsitemap_node.module 19 Dec 2008 11:16:15 -0000 1.19.2.14 +++ xmlsitemap_node/xmlsitemap_node.module 20 Dec 2008 12:41:33 -0000 @@ -103,7 +103,7 @@ '#title' => t('Comment ratio weight'), '#default_value' => variable_get('xmlsitemap_node_comment_priority', 0.5), '#options' => xmlsitemap_priority_options(), - '#description' => t('This number will be multiplied by the ratio of the number of comments on a post to the highest number of comments on any postÑthat is, this number will be added to the priority of the post with the most comments.'), + '#description' => t('This number will be multiplied by the ratio of the number of comments on a post to the highest number of comments on any post that is, this number will be added to the priority of the post with the most comments.'), ); $form['xmlsitemap_node']['xmlsitemap_node_count_comments'] = array( '#type' => 'checkbox', Index: xmlsitemap_node/xmlsitemap_node.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_node/xmlsitemap_node.install,v retrieving revision 1.9.2.8 diff -u -r1.9.2.8 xmlsitemap_node.install --- xmlsitemap_node/xmlsitemap_node.install 18 Dec 2008 10:59:13 -0000 1.9.2.8 +++ xmlsitemap_node/xmlsitemap_node.install 20 Dec 2008 12:41:33 -0000 @@ -47,31 +47,31 @@ */ function xmlsitemap_node_schema() { $schema['xmlsitemap_node'] = array( - 'description' => t('The base table for xmlsitemap_node.'), + 'description' => 'The base table for xmlsitemap_node.', 'fields' => array( 'nid' => array( - 'description' => t('The path of this node.'), + 'description' => 'The path of this node.', 'type' => 'int', 'unsigned' => TRUE, ), 'last_changed' => array( - 'description' => t('Keeps track of new changes.'), + 'description' => 'Keeps track of new changes.', 'type' => 'int', ), 'previously_changed' => array( - 'description' => t('Keeps track of old changes.'), + 'description' => 'Keeps track of old changes.', 'type' => 'int', ), 'last_comment' => array( - 'description' => t('Link to last comment.'), + 'description' => 'Link to last comment.', 'type' => 'int', ), 'previous_comment' => array( - 'description' => t('Link to previous comment.'), + 'description' => 'Link to previous comment.', 'type' => 'int', ), 'priority_override' => array( - 'description' => t('Stores the index value.'), + 'description' => 'Stores the index value.', 'type' => 'float', ), ), Index: xmlsitemap_file/xmlsitemap_file.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_file/Attic/xmlsitemap_file.install,v retrieving revision 1.1.4.14 diff -u -r1.1.4.14 xmlsitemap_file.install --- xmlsitemap_file/xmlsitemap_file.install 18 Dec 2008 23:06:15 -0000 1.1.4.14 +++ xmlsitemap_file/xmlsitemap_file.install 20 Dec 2008 12:41:33 -0000 @@ -15,28 +15,28 @@ */ function xmlsitemap_file_schema() { $schema['xmlsitemap_file'] = array( - 'description' => t('The base table for xmlsitemap_file.'), + 'description' => 'The base table for xmlsitemap_file.', 'fields' => array( 'fid' => array( - 'description' => t('The ID of the file.'), + 'description' => 'The ID of the file.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, ), 'nid' => array( - 'description' => t('The ID of the node containing the file.'), + 'description' => 'The ID of the node containing the file.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, ), 'changed' => array( - 'description' => t('The change time of the file.'), + 'description' => 'The change time of the file.', 'type' => 'int', ), 'previously_changed' => array( - 'description' => t('The previous change time of the file.'), + 'description' => 'The previous change time of the file.', 'type' => 'int', ), ), Index: xmlsitemap_engines/includes/xmlsitemap.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_engines/includes/Attic/xmlsitemap.inc,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 xmlsitemap.inc --- xmlsitemap_engines/includes/xmlsitemap.inc 29 Nov 2008 19:25:15 -0000 1.1.2.1 +++ xmlsitemap_engines/includes/xmlsitemap.inc 20 Dec 2008 12:41:33 -0000 @@ -149,7 +149,7 @@ break; case 'access': if (strpos($_SERVER['HTTP_USER_AGENT'], 'Googlebot') !== FALSE) { - return t('!sitemap downloaded by Google.', array('!sitemap' => $type)); + return t('@sitemap downloaded by Google.', array('@sitemap' => $type)); } break; } Index: xmlsitemap_user/xmlsitemap_user.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_user/xmlsitemap_user.install,v retrieving revision 1.6.2.10 diff -u -r1.6.2.10 xmlsitemap_user.install --- xmlsitemap_user/xmlsitemap_user.install 18 Dec 2008 10:59:13 -0000 1.6.2.10 +++ xmlsitemap_user/xmlsitemap_user.install 20 Dec 2008 12:41:33 -0000 @@ -34,23 +34,23 @@ */ function xmlsitemap_user_schema() { $schema['xmlsitemap_user'] = array( - 'description' => t('The base table for xmlsitemap_user.'), + 'description' => 'The base table for xmlsitemap_user.', 'fields' => array( 'uid' => array( - 'description' => t('The user ID.'), + 'description' => 'The user ID.', 'type' => 'int', 'unsigned' => TRUE, ), 'last_changed' => array( - 'description' => t('Keeps track of new changes.'), + 'description' => 'Keeps track of new changes.', 'type' => 'int', ), 'previously_changed' => array( - 'description' => t('Keeps track of old changes.'), + 'description' => 'Keeps track of old changes.', 'type' => 'int', ), 'priority_override' => array( - 'description' => t('Stores the index value.'), + 'description' => 'Stores the index value.', 'type' => 'float', ), ), @@ -58,16 +58,16 @@ ); $schema['xmlsitemap_user_role'] = array( - 'description' => t('The base table for xmlsitemap.'), + 'description' => 'The base table for xmlsitemap.', 'fields' => array( 'rid' => array( - 'description' => t('The role ID.'), + 'description' => 'The role ID.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, ), 'priority' => array( - 'description' => t('Stores the index value.'), + 'description' => 'Stores the index value.', 'type' => 'float', ), ), Index: docs/xmlsitemap.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/docs/xmlsitemap.php,v retrieving revision 1.5 diff -u -r1.5 xmlsitemap.php --- docs/xmlsitemap.php 20 May 2008 17:48:46 -0000 1.5 +++ docs/xmlsitemap.php 20 Dec 2008 12:41:32 -0000 @@ -182,7 +182,7 @@ break; case 'access': if (strpos($_SERVER['HTTP_USER_AGENT'], 'Googlebot') !== FALSE) { - return t('!sitemap downloaded by Google.', array('!sitemap' => $type)); + return t('@sitemap downloaded by Google.', array('@sitemap' => $type)); } break; } Index: xmlsitemap_engines/xmlsitemap_engines.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_engines/xmlsitemap_engines.module,v retrieving revision 1.5.2.7 diff -u -r1.5.2.7 xmlsitemap_engines.module --- xmlsitemap_engines/xmlsitemap_engines.module 29 Nov 2008 19:25:14 -0000 1.5.2.7 +++ xmlsitemap_engines/xmlsitemap_engines.module 20 Dec 2008 12:41:32 -0000 @@ -72,10 +72,10 @@ function xmlsitemap_engines_submit_sitemap($engine, $url_var, $default_url) { $result = drupal_http_request(variable_get($url_var, $default_url)); if ($result->code == 200) { - watchdog('xmlsitemap', 'Sitemap successfully submitted to !engine.', array('!engine' => $engine)); + watchdog('xmlsitemap', 'Sitemap successfully submitted to @engine.', array('@engine' => $engine)); } else { - watchdog('xmlsitemap', 'Error occurred submitting sitemap to !engine: @code', array('!engine' => $engine, '@code' => $result->code), WATCHDOG_ERROR); + watchdog('xmlsitemap', 'Error occurred submitting sitemap to @engine: @code', array('@engine' => $engine, '@code' => $result->code), WATCHDOG_ERROR); } } Index: xmlsitemap_term/xmlsitemap_term.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap_term/xmlsitemap_term.install,v retrieving revision 1.5.2.8 diff -u -r1.5.2.8 xmlsitemap_term.install --- xmlsitemap_term/xmlsitemap_term.install 18 Dec 2008 23:06:15 -0000 1.5.2.8 +++ xmlsitemap_term/xmlsitemap_term.install 20 Dec 2008 12:41:33 -0000 @@ -30,23 +30,23 @@ */ function xmlsitemap_term_schema() { $schema['xmlsitemap_term'] = array( - 'description' => t('The base table for xmlsitemap_term.'), + 'description' => 'The base table for xmlsitemap_term.', 'fields' => array( 'tid' => array( - 'description' => t('The id of the path.'), + 'description' => 'The id of the path.', 'type' => 'int', 'unsigned' => TRUE, ), 'last_changed' => array( - 'description' => t('Keeps track of new changes.'), + 'description' => 'Keeps track of new changes.', 'type' => 'int', ), 'previously_changed' => array( - 'description' => t('Keeps track of old changes.'), + 'description' => 'Keeps track of old changes.', 'type' => 'int', ), 'priority_override' => array( - 'description' => t('Stores the index value.'), + 'description' => 'Stores the index value.', 'type' => 'float', ), ),