Index: admin.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/imce/inc/admin.inc,v
retrieving revision 1.5.2.6
diff -u -r1.5.2.6 admin.inc
--- admin.inc	9 Feb 2009 18:24:36 -0000	1.5.2.6
+++ admin.inc	28 Apr 2009 10:44:56 -0000
@@ -351,19 +351,23 @@
 
   $output = '<h3 class="title">'. t('Directories') .'</h3>';
   $output .= theme('table', $header, $rows);
-  $output .= '<div class="form-item"><div class="description">'. t('Define directories that users of this profile can access.
-<ul>
-	<li>Use alphanumeric characters as directory paths.</li>
-	<li>To specify file system root, just enter <strong>.</strong>(dot) character.</li>
-	<li>Use <strong>%uid</strong> as a placeholder for user ID. Ex: <em>users/user%uid</em> creates directories such as <em>users/user1</em>, <em>users/user42</em>, etc.</li>
-  <li>To remove a directory from the list, leave the directory path blank.</li>
-  <li>If you want more flexibility in directory paths you can execute php to return a directory path.<br />
-  For php execution your directory path must start with <strong>php:</strong> and the rest must be a valid php code that is expected to return the actual directory path. <br />Ex: <strong>php: return \'users/\'.$user->name;</strong> defines <strong>users/USER-NAME</strong> as the directory path.<br />
-  A multi-level directory example <strong>php: return date(\'Y\', $user->created).\'/\'.date(\'m\', $user->created).\'/\'.$user->uid;</strong> defines <strong>MEMBERSHIP-YEAR/MONTH/USER-ID</strong> as the directory path, resulting in self-categorized user directories based on membership date.<br />
-  Note that you should use the $user variable instead of $GLOBALS[\'user\'] since they are not always the same object.</li>
-</ul>
-<p>Note that thumbnails permission does not affect thumbnail creation on upload. See thumbnails decription below.</p>
-<p>If you need more fields, just fill all and save, and you will get two more on the next page.</p>') .'</div></div>';
+  $output .= '<p class="description">'. t('Define directories that users of this profile can access.') .'</p>';
+  $output .= '<div class="form-item"><div class="description">';
+  $output .= '<h4>'. t('Notes:') .'</h4>';
+  $output .= '<ul><li>'. t('Use alphanumeric characters as directory paths.') .'</li>';
+  $output .= '<li>'. t('To specify file system root, just enter <strong>.</strong>(dot) character.') .'</li>';
+  $output .= '<li>'. t('Use <strong>%uid</strong> as a placeholder for user ID. Ex: <em>users/user%uid</em> creates directories such as <em>users/user1</em>, <em>users/user42</em>, etc.') .'</li>';
+  $output .= '<li>'. t('To remove a directory from the list, leave the directory path blank.') .'</li>';
+  $output .= '<li>'. t('If you want more flexibility in directory paths you can execute php to return a directory path.');
+    $output .= '<ul><li>'. t('For php execution your directory path must start with <strong>php:</strong> and the rest must be a valid php code that is expected to return the actual directory path.') .'</li>';
+    $output .= '<li>'. t('Ex: !samplecode defines <strong>users/USER-NAME</strong> as the directory path.', array('!samplecode' => '<strong>php: return \'users/\'.$user->name;</strong>')) .'</li>';
+    $output .= '<li>'. t('A multi-level directory example !samplecode defines <strong>MEMBERSHIP-YEAR/MONTH/USER-ID</strong> as the directory path, resulting in self-categorized user directories based on membership date.', array('!samplecode' => '<strong>php: return date(\'Y\', $user->created).\'/\'.date(\'m\', $user->created).\'/\'.$user->uid;</strong>')) .'</li>';
+    $output .= '<li>'. t('Note that you should use the $user variable instead of $GLOBALS[\'user\'] since they are not always the same object.') .'</li>';
+    $output .= '<li>'. t('Thumbnails permission does not affect thumbnail creation on upload. See thumbnails decription below.'). '</li>';
+    $output .= '</ul>';
+  $output .= '</li></ul>';  
+  $output .= '<p>'. t('If you need more fields, just fill all and save, and you will get two more on the next page.') .'</p>';
+  $output .= '</div></div>';
   $output .= drupal_render($form);
   return $output;
 }
@@ -413,18 +417,18 @@
       drupal_render($form[$key]['suffix']),
     );
   }
-
   $output = '<h3 class="title">'. t('Thumbnails') .'</h3>';
   $output .= theme('table', $header, $rows);
-  $output .= '<div class="form-item"><div class="description">'. t('You may create a list of thumbnail options that users can choose from.
-<ul>
-  <li>Use alphanumeric characters as thumbnail names.</li>
-  <li>Specify dimensions as <strong>WidthxHeight</strong>.</li>
-  <li>Prefix and suffix are strings that are added to original file name to create the thumbnail name.</li>
-  <li>An example thumbnail: Name = <strong>Small</strong>, Dimensions = <strong>80x80</strong>, Prefix = <strong>small_</strong></li>
-</ul>
-<p>Note that users will always be able to create thumbnails on file upload no matter what the thumbnail permission is. To disable thumbnail creation on file upload you should not define any thumbnails here.</p>
-<p>If you need more fields, just fill all and save, and you will get two more on the next page.</p>') .'</div></div>';
+  $output .= '<p class="description">'. t('You may create a list of thumbnail options that users can choose from.') .'</p>';
+  $output .= '<div class="form-item"><div class="description">';
+  $output .= '<h4>'. t('Notes:') .'</h4>';
+  $output .= '<ul><li>'. t('Use alphanumeric characters as thumbnail names.') .'</li>';
+  $output .= '<li>'. t('Specify dimensions as <strong>WidthxHeight</strong>.') .'</li>';
+  $output .= '<li>'. t('Prefix and suffix are strings that are added to original file name to create the thumbnail name.') .'</li>';
+  $output .= '<li>'. t('An example thumbnail: Name = <strong>Small</strong>, Dimensions = <strong>80x80</strong>, Prefix = <strong>small_</strong>') .'</li>';
+  $output .= '<li>'. t('Users will always be able to create thumbnails on file upload no matter what the thumbnail permission is. To disable thumbnail creation on file upload you should not define any thumbnails here.') .'</li></ul>';
+  $output .= '<p>'. t('If you need more fields, just fill all and save, and you will get two more on the next page.') .'</p>';
+  $output .= '</div></div>';
   $output .= drupal_render($form);
   return $output;
 }
Index: subdir.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/imce/inc/subdir.inc,v
retrieving revision 1.3
diff -u -r1.3 subdir.inc
--- subdir.inc	29 Feb 2008 16:57:12 -0000	1.3
+++ subdir.inc	24 Apr 2009 15:10:52 -0000
@@ -7,7 +7,7 @@
 function imce_form_subdirectory(&$form_state) {
   $form['help'] = array(
     '#type' => 'markup',
-    '#value' => t('<p>Here you can create subdirectories for your users. Multiple directory creation is possible at a time with the <strong>*</strong> character. For example, specifying <strong>user*/foo</strong> will create <strong>foo</strong> named directories under each directory starting with <strong>user</strong>. */foo*/bar will create bar named directories under directories starting with foo in each directory of file system path.</p>'),
+    '#value' => '<p>'. t('Here you can create subdirectories for your users. Multiple directory creation is possible at a time with the <strong>*</strong> character. For example, specifying <strong>user*/foo</strong> will create <strong>foo</strong> named directories under each directory starting with <strong>user</strong>. */foo*/bar will create bar named directories under directories starting with foo in each directory of file system path.') .'</p>',
   );
   $form['path'] = array(
     '#title' => t('Directory path'),