Index: xmlsitemap.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/xmlsitemap.install,v
retrieving revision 1.5.2.47
diff -u -p -r1.5.2.47 xmlsitemap.install
--- xmlsitemap.install	22 Jun 2009 15:06:06 -0000	1.5.2.47
+++ xmlsitemap.install	1 Jul 2009 22:21:29 -0000
@@ -543,11 +543,11 @@ function xmlsitemap_update_6150() {
   $ret = array();
   $path = drupal_get_path('module', 'xmlsitemap');
   if (is_dir($path . '/xmlsitemap')) {
-    $msg = 'You have not correctly followed the installation instructions for this module.  You must make certain that the old xmlsitemap/xmlsitemap diretory is removed.  The xmlsitemap/xmlsitemap/xmlsitemap.* files have been moved back to the modules root directory.  The install instructions were to remove the modules/xmlsitemap directory completely before extracting the update.  If you had followed that step you would have prevented this message.';
-    watchdog('xmlsitemap', $msg, array(), WATCHDOG_ERROR);
+    $t = get_t();
+    watchdog('xmlsitemap', 'You have not correctly followed the installation instructions for this module. You must make certain that the old xmlsitemap/xmlsitemap diretory is removed. The xmlsitemap/xmlsitemap/xmlsitemap.* files have been moved back to the modules root directory. The install instructions were to remove the modules/xmlsitemap directory completely before extracting the update. If you had followed that step you would have prevented this message.', NULL, WATCHDOG_ERROR);
     $ret['#abort'] = array(
       'success' => FALSE,
-      'query' => $msg,
+      'query' => $t('You have not correctly followed the installation instructions for this module. You must make certain that the old xmlsitemap/xmlsitemap diretory is removed. The xmlsitemap/xmlsitemap/xmlsitemap.* files have been moved back to the modules root directory. The install instructions were to remove the modules/xmlsitemap directory completely before extracting the update. If you had followed that step you would have prevented this message.'),
     );
   }
   return $ret;
@@ -561,12 +561,11 @@ function xmlsmitemap_requirements($phase
   $path = drupal_get_path('module', 'xmlsitemap');
   if (is_dir($path . '/xmlsitemap')) {
     $t = get_t();
-    $msg = 'You have not correctly followed the installation instructions for this module.  You must make certain that the old xmlsitemap/xmlsitemap diretory is removed.  The xmlsitemap/xmlsitemap/xmlsitemap.* files have been moved back to the modules root directory.  The install instructions were to removed the modules/xmlsitemap directory completely before extracting the update.  If you had followed that step you would have prevented this message.';
-    watchdog('xmlsitemap', $msg, array(), WATCHDOG_ERROR);
+    watchdog('xmlsitemap', 'You have not correctly followed the installation instructions for this module. You must make certain that the old xmlsitemap/xmlsitemap diretory is removed. The xmlsitemap/xmlsitemap/xmlsitemap.* files have been moved back to the modules root directory. The install instructions were to removed the modules/xmlsitemap directory completely before extracting the update. If you had followed that step you would have prevented this message.', NULL, WATCHDOG_ERROR);
     $requirements['xmlsitemap'] = array(
       'title' => $t('xmlsitemap'),
       'value' => $t('Installation issue'),
-      'description' => $t($msg),
+      'description' => $t('You have not correctly followed the installation instructions for this module. You must make certain that the old xmlsitemap/xmlsitemap diretory is removed. The xmlsitemap/xmlsitemap/xmlsitemap.* files have been moved back to the modules root directory. The install instructions were to removed the modules/xmlsitemap directory completely before extracting the update. If you had followed that step you would have prevented this message.'),
       'severity' => REQUIREMENT_ERROR,
     );
   }
Index: xmlsitemap.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/xmlsitemap/Attic/xmlsitemap.pages.inc,v
retrieving revision 1.1.4.3
diff -u -p -r1.1.4.3 xmlsitemap.pages.inc
--- xmlsitemap.pages.inc	29 Jun 2009 12:02:39 -0000	1.1.4.3
+++ xmlsitemap.pages.inc	1 Jul 2009 22:21:30 -0000
@@ -46,10 +46,10 @@ function xmlsitemap_output($chunk = NULL
       $chunk_size = XMLSITEMAP_MAX_SITEMAP_LINKS;
     }
     variable_set('xmlsitemap_chunk_size', $chunk_size);
-    watchdog('xmlsitemap', t('Chunk size has been updated to %d.', $chunk_size));
+    watchdog('xmlsitemap', 'Chunk size has been updated to @chunk-size.', array('@chunk-size' => $chunk_size));
   }
   elseif($chunk_count > XMLSITEMAP_MAX_SITEMAP_INDEX_LINKS) {
-    watchdog('xmlsitemap', t('The maximum number of allowed links has been reached.'), WATCHDOG_ERROR);
+    watchdog('xmlsitemap', 'The maximum number of allowed links has been reached.', NULL, WATCHDOG_ERROR);
   }
   if (isset($chunk) && !is_numeric($chunk)) {
     drupal_not_found();
@@ -242,7 +242,7 @@ function _xmlsitemap_create_cache_files(
   }
   if ($link_count > $chunk_size) {
     if (!$fp = fopen($parent_directory ."/xsm-$id.xml", 'wb')) {
-      watchdog('xmlsitemap', 'Cannot create the cache file (@file).', array('@file' => $parent_directory ."/xsm-$id.xml"), WATCHDOG_ERROR);
+      watchdog('xmlsitemap', 'Could not create the cache file @file.', array('@file' => $parent_directory ."/xsm-$id.xml"), WATCHDOG_ERROR);
       return FALSE;
     }
     fwrite($fp, '<?xml version="1.0" encoding="UTF-8"?>' . "\n");
@@ -267,7 +267,7 @@ function _xmlsitemap_create_cache_files(
     @chmod($parent_directory ."/xsm-$id.xml", 0664);
     for ($chunk = 0; $chunk < $link_count / $chunk_size; ++$chunk) {
       if (!$fp = fopen($parent_directory ."/xsm-$id-$chunk.xml", 'wb')) {
-        watchdog('xmlsitemap', 'Cannot create the cache file (@file).', array('@file' => $parent_directory ."/xsm-$id-$chunk.xml"), WATCHDOG_ERROR);
+        watchdog('xmlsitemap', 'Could not create the cache file @file.', array('@file' => $parent_directory ."/xsm-$id-$chunk.xml"), WATCHDOG_ERROR);
         return FALSE;
       }
       _xmlsitemap_create_cache_chunk($fp, $chunk_size, $chunk);
@@ -278,7 +278,7 @@ function _xmlsitemap_create_cache_files(
   }
   else {
     if (!$fp = fopen($parent_directory ."/xsm-$id.xml", 'wb')) {
-      watchdog('xmlsitemap', 'Cannot create the cache file (@file).', array('@file' => $parent_directory ."/xsm-$id.xml"), WATCHDOG_ERROR);
+      watchdog('xmlsitemap', 'Could not create the cache file @file.', array('@file' => $parent_directory ."/xsm-$id.xml"), WATCHDOG_ERROR);
       return FALSE;
     }
     _xmlsitemap_create_cache_chunk($fp, $chunk_size);