Index: contrib/image_gallery/image_gallery.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/image_gallery.install,v
retrieving revision 1.8
diff -u -r1.8 image_gallery.install
--- contrib/image_gallery/image_gallery.install	17 Aug 2008 08:54:50 -0000	1.8
+++ contrib/image_gallery/image_gallery.install	22 Dec 2008 22:55:45 -0000
@@ -21,7 +21,7 @@
     else {
       $requirements['image_gallery']['value'] = t('No galleries defined');
       $requirements['image_gallery']['description'] =
-        t('The Image gallery module is enabled, but no galleries have been created.  You should <a href="@create">create</a> at least one image gallery.',
+        t('The Image gallery module is enabled, but no galleries have been created. You should <a href="@create">create</a> at least one image gallery.',
           array('@create' => url('admin/content/image/add')));
       $requirements['image_gallery']['severity'] = REQUIREMENT_WARNING;
     }
Index: contrib/image_gallery/image_gallery.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_gallery/image_gallery.module,v
retrieving revision 1.28
diff -u -r1.28 image_gallery.module
--- contrib/image_gallery/image_gallery.module	17 Aug 2008 09:04:19 -0000	1.28
+++ contrib/image_gallery/image_gallery.module	22 Dec 2008 22:55:45 -0000
@@ -397,7 +397,7 @@
       }
       $content .= "<h3>". l($gallery->name, 'image/tid/'. $gallery->tid) ."</h3>\n";
       $content .= '<div class="description">'. check_markup($gallery->description) ."</div>\n";
-      $content .= '<p class="count">'. format_plural($gallery->count, 'There is 1 image in this gallery', 'There are @count images in this gallery') ."</p>\n";
+      $content .= '<p class="count">'. format_plural($gallery->count, 'There is 1 image in this gallery.', 'There are @count images in this gallery.') ."</p>\n";
       if ($gallery->latest->changed) {
         $content .= '<p class="last">'. t('Last updated: %date', array('%date' => format_date($gallery->latest->changed))) ."</p>\n";
       }
@@ -419,7 +419,7 @@
   }
 
   if (count($images) + count($galleries) == 0) {
-      $content .= '<p class="count">'. format_plural(0, 'There is 1 image in this gallery', 'There are @count images in this gallery') ."</p>\n";
+      $content .= '<p class="count">'. format_plural(0, 'There is 1 image in this gallery.', 'There are @count images in this gallery.') ."</p>\n";
   }
 
   return $content;
Index: contrib/image_attach/image_attach_views_handler_field_iid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_attach/image_attach_views_handler_field_iid.inc,v
retrieving revision 1.1
diff -u -r1.1 image_attach_views_handler_field_iid.inc
--- contrib/image_attach/image_attach_views_handler_field_iid.inc	20 Oct 2008 23:52:48 -0000	1.1
+++ contrib/image_attach/image_attach_views_handler_field_iid.inc	22 Dec 2008 22:55:45 -0000
@@ -25,7 +25,7 @@
     }
     $form['size'] = array(
       '#type' => 'select',
-      '#title' => t('Image Size'),
+      '#title' => t('Image size'),
       '#options' => $options,
       '#default_value' => $this->options['size'],
     );
@@ -33,7 +33,7 @@
     $form['as_link'] = array(
       '#type' => 'select',
       '#title' => t('Link'),
-      '#options' => array('none' => t('No link'), 'node' => t('Node'), 'image' => t('Image Node')),
+      '#options' => array('none' => t('No link'), 'node' => t('Node'), 'image' => t('Image node')),
       '#default_value' => $this->options['as_link'],
     );
   }
Index: contrib/image_attach/image_attach.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_attach/image_attach.module,v
retrieving revision 1.43
diff -u -r1.43 image_attach.module
--- contrib/image_attach/image_attach.module	20 Oct 2008 23:52:48 -0000	1.43
+++ contrib/image_attach/image_attach.module	22 Dec 2008 22:55:45 -0000
@@ -24,14 +24,14 @@
   $items = array();
 
   $items['image_attach'] = array(
-    'title' => 'Image Attachment View',
+    'title' => 'Image attachment view',
     'page callback' => 'image_attach_view_image',
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
   );
   $items['admin/settings/image/image_attach'] = array(
     'title' => 'Image attach',
-    'description' => 'Enable image attach for content',
+    'description' => 'Enable image attach for content.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('image_attach_admin_settings'),
     'access arguments' => array('administer site configuration'),
@@ -62,7 +62,7 @@
   switch ($op) {
     case 'list':
       $blocks[0] = array(
-        'info'       => t('Attached Images'),
+        'info'       => t('Attached images'),
         'status'     => TRUE,
         'weight'     => 0,
         'visibility' => 1,
@@ -79,7 +79,7 @@
             if (node_access('view', $image)) {
               $img = image_display($image, variable_get('image_attach_block_0_size', IMAGE_THUMBNAIL));
               return array(
-                'subject' => t('Attached Images'),
+                'subject' => t('Attached images'),
                 'content' => l($img, "node/$node->iid", array('html' => TRUE)),
               );
             }
@@ -99,7 +99,7 @@
           '#title' => t('Image size'),
           '#default_value' => variable_get('image_attach_block_0_size', IMAGE_THUMBNAIL),
           '#options' => $image_sizes,
-          '#description' => t("This determines the size of the image that appears in the block."),
+          '#description' => t('This determines the size of the image that appears in the block.'),
         );
         return $form;
       }
@@ -136,7 +136,7 @@
     );
     $form['image_attach']['image_attach'] = array(
       '#type' => 'radios',
-      '#title' => t('Attach Images'),
+      '#title' => t('Attach images'),
       '#default_value' => variable_get('image_attach_'. $form['#node_type']->type, 0),
       '#options' => array(0 => t('Disabled'), 1 => t('Enabled')),
       '#description' => t('Should this node allows users to upload an image?'),
@@ -152,7 +152,7 @@
       '#type' => 'weight',
       '#title' => t('Teaser image weight'),
       '#default_value' => variable_get('image_attach_weight_teaser_'. $form['#node_type']->type, 0),
-      '#description' => t("This value determines the order of the image when displayed in the teaser."),
+      '#description' => t('This value determines the order of the image when displayed in the teaser.'),
     );
     $form['image_attach']['image_attach_size_body'] = array(
       '#type' => 'select',
@@ -165,7 +165,7 @@
       '#type' => 'weight',
       '#title' => t('Full node image weight'),
       '#default_value' => variable_get('image_attach_weight_body_'. $form['#node_type']->type, 0),
-      '#description' => t("This value determines the order of the image when displayed in the body."),
+      '#description' => t('This value determines the order of the image when displayed in the body.'),
     );
   }
   // Node edit form.
@@ -180,7 +180,7 @@
 
       $form['image_attach'] = array(
         '#type' => 'fieldset',
-        '#title' => t('Attached Images'),
+        '#title' => t('Attached images'),
         '#collapsible' => TRUE,
         '#collapsed' => empty($node->iid),
       );
@@ -198,7 +198,7 @@
       if (variable_get('image_attach_existing', 1) && user_access('access content')) {
         $form['image_attach']['iid'] = array(
           '#type' => 'select',
-          '#title' => t('Existing Image'),
+          '#title' => t('Existing image'),
           '#options' => _image_attach_get_image_nodes(),
           $value => empty($node->iid) ? NULL : $node->iid,
           '#description' => t('Choose an image already existing on the server if you do not upload a new one.')
@@ -217,7 +217,7 @@
       }
       $form['image_attach']['image'] = array(
         '#type' => 'file',
-        '#title' => t('Upload Image')
+        '#title' => t('Upload image')
       );
       $form['image_attach']['image_title'] = array(
         '#type' => 'textfield',
Index: image.imagemagick.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/image.imagemagick.inc,v
retrieving revision 1.22
diff -u -r1.22 image.imagemagick.inc
--- image.imagemagick.inc	14 Apr 2008 05:15:36 -0000	1.22
+++ image.imagemagick.inc	22 Dec 2008 22:55:43 -0000
@@ -16,7 +16,7 @@
 
   $form['imagemagick_binary'] = array(
     '#type' => 'fieldset',
-    '#title' => t('ImageMagick Binary'),
+    '#title' => t('ImageMagick binary'),
     '#collapsible' => FALSE,
     '#description' => t('ImageMagick is a standalone program used to manipulate images. To use it, it must be installed on your server and you need to know where it is located. If you are unsure of the exact path consult your ISP or server administrator.'),
   );
@@ -25,7 +25,7 @@
     '#title' => t('Path to the "convert" binary'),
     '#default_value' => variable_get('image_imagemagick_convert', '/usr/bin/convert'),
     '#required' => TRUE,
-    '#description' => t('Specify the complete path to the ImageMagic <kbd>convert</kbd> binary. For example: <kbd>/usr/bin/convert</kbd> or <kbd>C:\Program Files\ImageMagick-6.3.4-Q16\convert.exe</kbd>'),
+    '#description' => t('Specify the complete path to the ImageMagic <kbd>convert</kbd> binary. For example: <kbd>/usr/bin/convert</kbd> or <kbd>C:\Program Files\ImageMagick-6.3.4-Q16\convert.exe</kbd>.'),
   );
   $form['imagemagick_binary']['image_imagemagick_debugging'] = array(
     '#type' => 'checkbox',
@@ -57,7 +57,7 @@
   }
   if ($attach_error_to) {
     if ($open_basedir = ini_get('open_basedir')) {
-      form_set_error($attach_error_to, t("No file %file could be found. PHP's <a href='!open-basedir'>open_basedir</a> security resriction is set to %open-basedir, which may be interfering with the attempts to locate ImageMagick.", array('%file' => $path, '%open-basedir' => $open_basedir, '!info-link' => url('http://php.net/features.safe-mode#ini.open-basedir') )));
+      form_set_error($attach_error_to, t("No file %file could be found. PHP's <a href='@open_basedir'>open_basedir</a> security restriction is set to %open_basedir, which may be interfering with the attempts to locate ImageMagick.", array('%file' => $path, '%open_basedir' => $open_basedir, '@open_basedir' => 'http://php.net/features.safe-mode#ini.open-basedir')));
     }
     else {
       form_set_error($attach_error_to, t('The specified ImageMagic path %file does not exist.', array('%file' => $path)));
@@ -168,12 +168,12 @@
 
     // Display debugging information to authorized users.
     if (variable_get('image_imagemagick_debugging', FALSE) && user_access('administer site configuration')) {
-      drupal_set_message(t("ImageMagick command: @command", array('@command' => $convert_path .' '. $command_args)));
-      drupal_set_message(t("ImageMagick output: @output", array('@output' => $output)));
+      drupal_set_message(t('ImageMagick command: @command', array('@command' => $convert_path .' '. $command_args)));
+      drupal_set_message(t('ImageMagick output: @output', array('@output' => $output)));
     }
 
     if ($errors) {
-      drupal_set_message(t("ImageMagick reported an error: %error", array('%error' => $errors)), 'error');
+      drupal_set_message(t('ImageMagick reported an error: %error.', array('%error' => $errors)), 'error');
     }
 
     fclose($pipes[0]);
Index: image.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/image.module,v
retrieving revision 1.279
diff -u -r1.279 image.module
--- image.module	22 Dec 2008 22:04:29 -0000	1.279
+++ image.module	22 Dec 2008 22:55:44 -0000
@@ -16,15 +16,15 @@
   switch ($path) {
     case 'admin/help#image':
       $output = '<p>'. t('The image module is used to create and administer images for your site. Each image is stored as a post, with thumbnails of the original generated automatically. There are two default thumbnail sizes, thumbnail and preview. The thumbnail size is shown as the preview for image posts and when browsing image galleries. The preview is the default size when first displaying an image node.') .'</p>';
-      $output .= '<p>'. t('Image administration allows the image directory and the image sizes to be set.</p><p>
-Image galleries are used to organize and display images in galleries.   The list tab allows users to edit existing image gallery names, descriptions, parents and relative position, known as a weight.  The add galleries tab allows you to create a new image gallery defining name, description, parent and weight.') .'</p>';
-      $output .= t('<p>You can</p>
-<ul>
-<li>view image handling messages in <a href="!admin-settings">administer &gt;&gt; settings</a>.</li>
-<li>configure image sizes and file directories at <a href="!admin-settings-image">administer &gt;&gt; settings &gt;&gt; image</a>.</li>
-<li>use the <a href="!external-http-drupal-org-project-img_assist">image assist module</a> to upload and insert images into posts.</li>
-', array('!admin-settings' => url('admin/settings'), '!admin-image-galleries' => url('admin/image/galleries'), '!admin-settings-image' => url('admin/settings/image'), '!external-http-drupal-org-project-img_assist' => 'http://drupal.org/project/img_assist')) .'</ul>';
-      $output .= '<p>'. t('For more information please read the configuration and customization handbook <a href="!image">Image page</a>.', array('!image' => 'http://www.drupal.org/handbook/modules/image/')) .'</p>';
+      $output .= '<p>'. t('Image administration allows the image directory and the image sizes to be set.') .'</p>';
+      $output .= '<p>'. t('Image galleries are used to organize and display images in galleries. The list tab allows users to edit existing image gallery names, descriptions, parents and relative position, known as a weight. The add galleries tab allows you to create a new image gallery defining name, description, parent and weight.') .'</p>';
+      $output .= '<p>'. t('You are able to:') .'</p>';
+      $output .= '<ul>';
+      $output .= '<li>'. t('View image handling messages in <a href="@admin_settings">administer &gt;&gt; settings</a>.', array('@admin_settings' => url('admin/settings'))) .'</li>';
+      $output .= '<li>'. t('Configure image sizes and file directories at <a href="@admin_settings_image">administer &gt;&gt; settings &gt;&gt; image</a>.', array('@admin_settings_image' => url('admin/settings/image'))) .'</li>';
+      $output .= '<li>'. t('Use the <a href="@external_http_drupal_org_project_img_assist">image assist module</a> to upload and insert images into posts.', array('@external_http_drupal_org_project_img_assist' => 'http://drupal.org/project/img_assist')) .'</li>';
+      $output .= '</ul>';
+      $output .= '<p>'. t('For more information, see the online handbook entry for <a href="@image">Image module</a>.', array('@image' => 'http://www.drupal.org/handbook/modules/image/')) .'</p>';
       return $output;
   }
 }
@@ -580,7 +580,7 @@
       // Display a message to the user if they're be able to modify the node
       // (this might have been called as part of a rebuild by a visitor).
       if (image_access('update', $node)) {
-        drupal_set_message(t('The derivative images for <a href="!link">%title</a> have been regenerated.', array('!link' => url('node/'. $node->nid), '%title' => $node->title)));
+        drupal_set_message(t('The derivative images for <a href="@link">@title</a> have been regenerated.', array('@link' => url('node/'. $node->nid), '@title' => $node->title)));
       }
 
       // Clear the flag so that we don't some how rebuild the images twice.
@@ -737,7 +737,7 @@
 
   // Sanity check : make sure we've got a working toolkit
   if (!image_get_toolkit()) {
-    drupal_set_message(t('No image toolkit is currently enabled. Without one the image module will not be able to resize your images. You can select one from the <a href="!link">image toolkit settings page</a>.', array('!link' => url('admin/settings/image-toolkit'))), 'error');
+    drupal_set_message(t('No image toolkit is currently enabled. Without one the image module will not be able to resize your images. You can select one from the <a href="@link">image toolkit settings page</a>.', array('@link' => url('admin/settings/image-toolkit'))), 'error');
     return false;
   }
   return true;
@@ -820,7 +820,7 @@
     }
 
     if (!$status) {
-      drupal_set_message(t('Unable to create scaled %label image', array('%label' => $size['label'])), 'error');
+      drupal_set_message(t('Unable to create scaled %label image.', array('%label' => $size['label'])), 'error');
       return FALSE;
     }
     // Set standard file permissions for webserver-generated files
Index: image.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/image.admin.inc,v
retrieving revision 1.1
diff -u -r1.1 image.admin.inc
--- image.admin.inc	4 Feb 2008 00:34:22 -0000	1.1
+++ image.admin.inc	22 Dec 2008 22:55:43 -0000
@@ -21,7 +21,7 @@
     '#type' => 'textfield',
     '#title' => t('Default image path'),
     '#default_value' => variable_get('image_default_path', 'images'),
-    '#description' => t('Subdirectory in the directory "%dir" where pictures will be stored. Do not include trailing slash.', array('%dir' => variable_get('file_directory_path', 'files'))),
+    '#description' => t('Subdirectory in the directory %dir where pictures will be stored. Do not include trailing slash.', array('%dir' => variable_get('file_directory_path', 'files'))),
   );
 
   $form['files']['image_max_upload_size'] = array(
@@ -30,7 +30,7 @@
     '#default_value' => variable_get('image_max_upload_size', 800),
     '#field_suffix' => t('KB'),
     '#size' => 12,
-    '#description' => t('Maximum file size for image uploads. When a maximum image dimensions is specified for original images the size is checked after resizing. '),
+    '#description' => t('Maximum file size for image uploads. When a maximum image dimensions is specified for original images the size is checked after resizing.'),
   );
 
   $form['image_sizes'] = array(
Index: image.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/image.install,v
retrieving revision 1.15
diff -u -r1.15 image.install
--- image.install	6 Jan 2008 22:15:24 -0000	1.15
+++ image.install	22 Dec 2008 22:55:44 -0000
@@ -21,7 +21,7 @@
         'default' => 0,
       ),
       'image_size' => array(
-        'description' => t('Primary Key: The {files}.filename of the image file.  For image module this indicates the file size.'),
+        'description' => t('Primary Key: The {files}.filename of the image file. For image module this indicates the file size.'),
         'type' => 'varchar',
         'length' => 32,
         'not null' => TRUE,
@@ -61,15 +61,15 @@
     // Make sure we've got a working toolkit
     if ($toolkit = image_get_toolkit()) {
       $requirements['image_toolkit'] = array(
-        'value' => t('The %toolkit-name toolkit is installed', array('%toolkit-name' => $toolkit)),
+        'value' => t('The %toolkit_name toolkit is installed.', array('%toolkit_name' => $toolkit)),
         'severity' => REQUIREMENT_OK,
       ); 
     }
     else {
       $requirements['image_toolkit'] = array(
-        'value' => t('Not installed'),
+        'value' => t('Not installed.'),
         'severity' => REQUIREMENT_ERROR,
-        'description' => t('No image toolkit is currently enabled. Without one the image module will not be able to resize your images. You can select one from the <a href="!link">image toolkit settings page</a>.', array('!link' => url('admin/settings/image-toolkit'))),
+        'description' => t('No image toolkit is currently enabled. Without one the image module will not be able to resize your images. You can select one from the <a href="@link">image toolkit settings page</a>.', array('@link' => url('admin/settings/image-toolkit'))),
       );
     }
     $requirements['image_toolkit']['title'] = t('Image toolkit');
@@ -80,21 +80,21 @@
     $temp_path = rtrim($image_path, '/') .'/temp';
     if (!file_check_directory($image_path, FILE_CREATE_DIRECTORY)) {
       $requirements['image_dirs'] = array(
-        'value' => t('Missing directory'),
+        'value' => t('Missing directory.'),
         'severity' => REQUIREMENT_ERROR,
-        'description' => t("The image module's image directory %image-dir is missing.", array('%image-dir' => $image_path)),
+        'description' => t("The image module's image directory %image_dir is missing.", array('%image_dir' => $image_path)),
       );
     }
     else if (!file_check_directory($temp_path, FILE_CREATE_DIRECTORY)) {
       $requirements['image_dirs'] = array(
-        'value' => t('Missing temp directory'),
+        'value' => t('Missing temp directory.'),
         'severity' => REQUIREMENT_ERROR,
-        'description' => t("The image module's temp directory %temp-dir is missing.", array('%temp-dir' => $temp_path)),
+        'description' => t("The image module's temp directory %temp_dir is missing.", array('%temp_dir' => $temp_path)),
       );
     }
     else {
       $requirements['image_dirs'] = array(
-        'value' => t('Exists (%path)', array('%path' => $image_path)),
+        'value' => t('Exists (%path).', array('%path' => $image_path)),
         'severity' => REQUIREMENT_OK,
       );
     }
@@ -186,7 +186,7 @@
   if ($old_sizes = variable_get('image_sizes', FALSE)) {
     // Make sure all the required sizes are represented.
     if (!isset($old_sizes[IMAGE_ORIGINAL])) {
-      drupal_set_message(t("The original image size was missing so no changes were made. See this <a href='!link'>image module issue</a> for more information. Include the following:<br /><pre>@old_sizes\n</pre>", array('!link' => url('http://drupal.org/node/158334'), '@old_sizes' => print_r($old_sizes, 1))), 'error');
+      drupal_set_message(t("The original image size was missing so no changes were made. See this <a href='@link'>image module issue</a> for more information. Include the following:<br /><pre>@old_sizes\n</pre>", array('@link' => 'http://drupal.org/node/158334', '@old_sizes' => print_r($old_sizes, 1))), 'error');
       return array();
     }
     // These sizes may already exist under incorrect keys. We'll put a default
Index: contrib/image_import/image_import.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_import/image_import.pages.inc,v
retrieving revision 1.1
diff -u -r1.1 image_import.pages.inc
--- contrib/image_import/image_import.pages.inc	22 Dec 2008 21:37:28 -0000	1.1
+++ contrib/image_import/image_import.pages.inc	22 Dec 2008 22:55:46 -0000
@@ -118,7 +118,7 @@
   else {
     $form['none_found'] = array(
       '#type' => 'item',
-      '#value' => t('<em>No files were found.</em>'),
+      '#value' => '<em>' . t('No files were found.') . '</em>',
     );
   }
 
@@ -189,7 +189,7 @@
     // Remove the original image now that the import has completed.
     file_delete($args['filepath']);
 
-    $context['results']['good'][] = t('Imported %origname as <a href="!node-link">@node-title</a> @status <a href="!edit-link">[edit]</a>', array(
+    $context['results']['good'][] = t('Imported %origname as <a href="!node-link">@node-title</a> @status <a href="!edit-link">[edit]</a>.', array(
       '%origname' => $args['origname'],
       '!node-link' => url('node/'. $node->nid),
       '@node-title' => $node->title,
Index: contrib/image_import/image_import.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_import/image_import.install,v
retrieving revision 1.5
diff -u -r1.5 image_import.install
--- contrib/image_import/image_import.install	17 Aug 2008 08:54:50 -0000	1.5
+++ contrib/image_import/image_import.install	22 Dec 2008 22:55:45 -0000
@@ -17,12 +17,12 @@
     }
     elseif (!file_check_directory($dirpath)) {
       // The import directory does not exist, indicate an error.
-      $requirements['image_import_dir']['value'] = t('Import directory <em>@dirpath</em> does not exist or is not writable.', array('@dirpath' => $dirpath));
-      $requirements['image_import_dir']['description'] = t('The import directory <em>@dirpath</em> either does not exist or does not grant the web container write permission.  Either <a href="@choose">choose</a> a different directory or create the <em>@dirpath</em> directory and grant write permissions.  The Image import module will not function until this is corrected.', array('@dirpath' => $dirpath, '@choose'=> url('admin/settings/image_import')));
+      $requirements['image_import_dir']['value'] = t('Import directory %dirpath does not exist or is not writable.', array('%dirpath' => $dirpath));
+      $requirements['image_import_dir']['description'] = t('The import directory %dirpath either does not exist or does not grant the web container write permission. Either <a href="@choose">choose</a> a different directory or create the %dirpath directory and grant write permissions. The Image import module will not function until this is corrected.', array('%dirpath' => $dirpath, '@choose'=> url('admin/settings/image_import')));
       $requirements['image_import_dir']['severity'] = REQUIREMENT_ERROR;
     }
     else {
-      $requirements['image_import_dir']['value'] = t('Import directory <em>@dirpath</em> exists', array('@dirpath' => $dirpath));
+      $requirements['image_import_dir']['value'] = t('Import directory %dirpath exists.', array('%dirpath' => $dirpath));
       $requirements['image_import_dir']['severity'] = REQUIREMENT_OK;
     }
   }
Index: contrib/image_import/image_import.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_import/image_import.module,v
retrieving revision 1.18
diff -u -r1.18 image_import.module
--- contrib/image_import/image_import.module	22 Dec 2008 21:37:28 -0000	1.18
+++ contrib/image_import/image_import.module	22 Dec 2008 22:55:46 -0000
@@ -7,9 +7,7 @@
 function image_import_help($path, $arg) {
   switch ($path) {
     case 'admin/content/image_import':
-      $output = '<p>'. t("Import multiple image files and save them as image nodes. The files will be moved from their location into the image module's files directory. ")
-        . t("Searching for image files in %dirpath.", array('%dirpath' => realpath(variable_get('image_import_path', '')))) .'</p>';
-      return $output;
+      return '<p>'. t("Import multiple image files and save them as image nodes. The files will be moved from their location into the image module's files directory. Searching for image files in %dirpath.", array('%dirpath' => realpath(variable_get('image_import_path', '')))) .'</p>';
     case 'admin/settings/image_import':
       return t("Configure the image import module's settings.");
     default:
Index: contrib/image_im_advanced/image_im_advanced.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_im_advanced/image_im_advanced.install,v
retrieving revision 1.1
diff -u -r1.1 image_im_advanced.install
--- contrib/image_im_advanced/image_im_advanced.install	17 Aug 2008 08:55:39 -0000	1.1
+++ contrib/image_im_advanced/image_im_advanced.install	22 Dec 2008 22:55:45 -0000
@@ -14,15 +14,15 @@
     if (!isset($toolkits['imagemagick'])) {
       $requirements['imagemagick']['value'] =
       t('ImageMagick image toolkit is not properly installed');
-      $requirements['imagemagick']['description'] = t('The <em>@toolkit_inc/image_imagemagick.inc</em> file must be copied to <em>@inc_dir in order for the ImageMagick image toolkit to function.', array('@toolkit_inc' => drupal_get_path('module', 'image'), '@inc_dir' => 'includes')); 
+      $requirements['imagemagick']['description'] = t('The %toolkit_inc file must be copied to %inc_dir in order for the ImageMagick image toolkit to function.', array('%toolkit_inc' => drupal_get_path('module', 'image') .'/image_imagemagick.inc', '%inc_dir' => 'includes')); 
       $requirements['imagemagick']['severity'] = REQUIREMENT_ERROR;
       return $requirements;
     }
     // If the image_im_advanced module is installed but the ImageMagick image
     // toolkit is not selected, indicate an error.
     if (image_get_toolkit() != 'imagemagick') {
-      $requirements['imagemagick']['value'] = t('ImageMagic image toolkit is not selected');
-      $requirements['imagemagick']['description'] = t('The ImageMagic image toolkit is not selected.  The advanced options only apply to the ImageMagick toolkit.  Select the image toolkit <a href="@toolkit">here</a>.', array('@toolkit' => url('admin/settings/image-toolkit')));
+      $requirements['imagemagick']['value'] = t('ImageMagic image toolkit is not selected.');
+      $requirements['imagemagick']['description'] = t('The ImageMagic image toolkit is not selected. The advanced options only apply to the ImageMagick toolkit. Select the image toolkit <a href="@toolkit">here</a>.', array('@toolkit' => url('admin/settings/image-toolkit')));
       $requirements['imagemagick']['severity'] = REQUIREMENT_WARNING;
       return $requirements;
     }
@@ -30,11 +30,11 @@
     $convert_path = variable_get('image_imagemagick_convert', '/usr/bin/convert');
     if (!is_file($convert_path)) {
       $requirements['imagemagick']['value'] = t('ImageMagick convert utility not found.');
-      $requirements['imagemagick']['description'] = t('The ImageMagick image convert utility (@convert) does not exist.  If you have ImageMagick installed, click <a href="@toolkit">here</a> to provide the path to the convert utility.', array('@convert' => $convert_path, '@toolkit' => url('admin/settings/image-toolkit')));
+      $requirements['imagemagick']['description'] = t('The ImageMagick image convert utility (@convert) does not exist. If you have ImageMagick installed, click <a href="@toolkit">here</a> to provide the path to the convert utility.', array('@convert' => $convert_path, '@toolkit' => url('admin/settings/image-toolkit')));
       $requirements['imagemagick']['severity'] = REQUIREMENT_ERROR;
       return $requirements;
     }
-    $requirements['imagemagick']['value'] = t('ImageMagick image toolkit is selected');
+    $requirements['imagemagick']['value'] = t('ImageMagick image toolkit is selected.');
     $requirements['imagemagick']['severity'] = REQUIREMENT_OK;
   }
   return $requirements;
Index: contrib/image_im_advanced/image_im_advanced.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/contrib/image_im_advanced/image_im_advanced.module,v
retrieving revision 1.5
diff -u -r1.5 image_im_advanced.module
--- contrib/image_im_advanced/image_im_advanced.module	15 Jan 2008 22:53:34 -0000	1.5
+++ contrib/image_im_advanced/image_im_advanced.module	22 Dec 2008 22:55:45 -0000
@@ -30,7 +30,7 @@
 
     $form['image_im_advanced_options'] = array(
       '#type' => 'fieldset',
-      '#title' => t('ImageMagick Advanced Options'),
+      '#title' => t('ImageMagick advanced options'),
       '#collapsible' => FALSE,
       '#description' => t("These settings let you control some of ImageMagick's more advanced options."),
       '#element_validate' => array('image_im_advanced_settings_validate'),
@@ -43,26 +43,26 @@
       '#maxlength' => 3,
       '#default_value' => $options['jpeg_quality'],
       '#field_suffix' => t('%'),
-      '#description' => t('Define the image quality for JPEG manipulations. Ranges from 0 to 100. Higher values mean better image quality but bigger files. <a href="!link">More information on -quality</a>', array('!link' => url('http://www.imagemagick.org/script/command-line-options.php#quality'))),
+      '#description' => t('Define the image quality for JPEG manipulations. Ranges from 0 to 100. Higher values mean better image quality but bigger files. <a href="@link">More information on -quality</a>.', array('@link' => 'http://www.imagemagick.org/script/command-line-options.php#quality')),
     );
     $form['image_im_advanced_options']['strip'] = array(
       '#type' => 'textfield',
       '#title' => t('Strip metadata from images at this size and below'),
       '#default_value' => $options['strip'],
-      '#description' => t('You may choose to strip all metadata, such as camera information and color profiles, from the processed images in order to reduce their file size. Please choose at what maximum size you want images to be stripped of their metadata. Example: "150x150". Enter "0x0" to disable this feature. This option requires ImageMagick 6.0.0 or higher. <a href="!link">More information on -strip</a>', array('!link' => url('http://www.imagemagick.org/script/command-line-options.php#strip'))),
+      '#description' => t('You may choose to strip all metadata, such as camera information and color profiles, from the processed images in order to reduce their file size. Please choose at what maximum size you want images to be stripped of their metadata. Example: "150x150". Enter "0x0" to disable this feature. This option requires ImageMagick 6.0.0 or higher. <a href="@link">More information on -strip</a>.', array('@link' => 'http://www.imagemagick.org/script/command-line-options.php#strip')),
     );
     $form['image_im_advanced_options']['colorspace'] = array(
       '#type' => 'select',
       '#title' => t('Convert colorspace'),
       '#default_value' => $options['colorspace'],
-      '#options' => array(0 => t('<None>'), 'RGB' => t('RGB'), 'GRAY' => t('Gray')),
-      '#description' => t('This option lets you convert images to the specified colorspace. This will be overridden by the Color profile option, if used. <a href="!link">More information on -colorspace</a>', array('!link' => url('http://www.imagemagick.org/script/command-line-options.php#colorspace'))),
+      '#options' => array(0 => t('- None -'), 'RGB' => t('RGB'), 'GRAY' => t('Gray')),
+      '#description' => t('This option lets you convert images to the specified colorspace. This will be overridden by the Color profile option, if used. <a href="@link">More information on -colorspace</a>.', array('@link' => 'http://www.imagemagick.org/script/command-line-options.php#colorspace')),
     );
     $form['image_im_advanced_options']['density'] = array(
       '#type' => 'checkbox',
       '#title' => t('Change image resolution to 72 ppi'),
       '#default_value' => $options['density'],
-      '#description' => t('If checked, this option will set the print resolution of the image to 72 pixels per inch, which is suitable for web use. This does not affect the pixel size or quality of the image.  <a href="!link">More information on -density</a>', array('!link' => url('http://www.imagemagick.org/script/command-line-options.php#density'))),
+      '#description' => t('If checked, this option will set the print resolution of the image to 72 pixels per inch, which is suitable for web use. This does not affect the pixel size or quality of the image. <a href="@link">More information on -density</a>.', array('@link' => 'http://www.imagemagick.org/script/command-line-options.php#density')),
     );
 
     $form['image_im_advanced_options']['unsharp'] = array(
@@ -70,7 +70,7 @@
       '#title' => t('Sharpening filter'),
       '#collapsible' => TRUE,
       '#collapsed' => ($options['unsharp']['amount'] == 0),
-      '#description' => t('The sharpness filter is used to regain some of the sharpness that is always lost when a digital photograph is scaled down. This is equivalent to the commonly used "Unsharp Mask" filter. It is important that these values are not set too high as it can easily make the images look artificial. <a href="!link">More information on -unsharp</a>', array('!link' => url('http://www.imagemagick.org/script/command-line-options.php#unsharp'))),
+      '#description' => t('The sharpness filter is used to regain some of the sharpness that is always lost when a digital photograph is scaled down. This is equivalent to the commonly used "Unsharp Mask" filter. It is important that these values are not set too high as it can easily make the images look artificial. <a href="@link">More information on -unsharp</a>.', array('@link' => 'http://www.imagemagick.org/script/command-line-options.php#unsharp')),
     );
     $form['image_im_advanced_options']['unsharp']['amount'] = array(
       '#type' => 'textfield',
