diff --git a/sites/all/modules/private_upload/private_upload.module b/sites/all/modules/private_upload/private_upload.module
index 5b3a2c2..5a984d4 100644
--- a/sites/all/modules/private_upload/private_upload.module
+++ b/sites/all/modules/private_upload/private_upload.module
@@ -189,7 +189,7 @@ function _private_upload_requirements($phase, &$status) {
       'severity' => REQUIREMENT_WARNING,
       'value' => $t('Private Downloads'),
       'description' => $t('You have !count old style file(s) listed in the database. ', array('!count'=>$old_file_count) ). 
-                       l( 'Click here to migrate', 'admin/private_upload/migrate_old'),
+                       l(t('Click here to migrate'), 'admin/private_upload/migrate_old'),
     );
     $status[] = '<div class="error">'. $requirements['private_upload_old']['description'] .'</div>';
   }  
@@ -275,8 +275,9 @@ function private_upload_nodeapi(&$node, $op, $teaser) {
                 $success = true;          
               }
               else {
-                drupal_set_message( "Could not move the file ($file->filepath) to the private directory ($private_path).", 'error' );
-		          }	                         
+                drupal_set_message(t("Could not move the file (%filename) to the private directory (%private_path).",
+                                   array('%filename' => $file->filepath, '%private_path' => $private_path)), 'error') ;
+		          }
             }
             else if (!$file->private && $file_is_private) { 
               // private flag is false, but file IS g in private repo
@@ -285,7 +286,8 @@ function private_upload_nodeapi(&$node, $op, $teaser) {
                 $success = true;
 	            }
 		          else {
-		            drupal_set_message( "Could not move the file ($file->filepath) to the public directory ($public).", 'error' );
+                drupal_set_message(t("Could not move the file (%filename) to the public directory (%public).",
+                                   array('%filename' => $file->filepath, '%public' => $public)), 'error' );
 		          }	            
             }
             
@@ -293,7 +295,7 @@ function private_upload_nodeapi(&$node, $op, $teaser) {
               _private_upload_update_filepath($filepath, $fid);
               $row_count = db_affected_rows();
               if( $row_count != 1 ) {
-                drupal_set_message( "Error: Unable to make uploaded file private! (". $row_count .")", 'error'  );
+                drupal_set_message(t("Error: Unable to make uploaded file private! (%row_count)", array('%row_count ' => $row_count)), 'error'  );
               }
             }
                      
@@ -350,9 +352,9 @@ function private_upload_form_alter(&$form, $from_state, $form_id) {
           );
           if( !realpath($file->filepath) ) {
             $form['attachments']['wrapper']['files'][$fid]['msg'] = array(
-              '#value' => ' <span style="color:red">*Missing*</span>',
+              '#value' => ' <span style="color:red">*' . t('Missing') . '*</span>',
             );
-            drupal_set_message("File is not where it should be: $file->filepath", 'warning');
+            drupal_set_message(t("File is not where it should be: %filename", array('%filename' => $file->filepath)), 'warning');
           }
          
           // Overwrite URL in description with special URL if file is private.
@@ -360,8 +362,8 @@ function private_upload_form_alter(&$form, $from_state, $form_id) {
           $description = "<small>". check_plain($href) ."</small>";
           $form['attachments']['wrapper']['files'][$fid]['description'] = array(
             '#type' => 'textfield', 
-            '#default_value' => (drupal_strlen($file->description)) ? $file->description : $file->filename, 
-            '#maxlength' => 256, 
+            '#default_value' => check_plain((drupal_strlen($file->description)) ? $file->description : $file->filename), 
+            '#maxlength' => 256,
             '#description' => $description, 
           );
          }
@@ -387,7 +389,7 @@ function private_upload_form_alter(&$form, $from_state, $form_id) {
         
         $form['files'][$fid]['private'] = array(
             '#type' => 'checkbox', 
-            '#default_value' => $private,
+            '#default_value' => check_plain($private),
         );
       }
     }
@@ -407,11 +409,11 @@ function private_upload_form_validate($form_id, $form_values) {
       $private_weight = (int)db_result(db_query("SELECT weight FROM {system} WHERE name = 'private_upload'"));
       if ($private_weight <= $upload_weight) {
         $new_weight = $upload_weight+1;
-        drupal_set_message( t("Adjusting private_upload's weight to "). $new_weight, 'warning');
+        drupal_set_message( t("Adjusting private_upload's weight to %new_weight", array('%new_weight' => $new_weight)), 'warning');
         db_query("UPDATE {system} SET weight = '%d' WHERE name = 'private_upload'", $new_weight);
       }
       else {
-        drupal_set_message(t("Please check for modules that conflicts with Private Upload."), error);
+        drupal_set_message(t("Please check for modules that conflicts with Private Upload."), 'error');
       }
     }
   }
@@ -486,9 +488,9 @@ function private_upload_admin() {
   );
   
   $public = file_directory_path();
-  $status[] = "Public File Folder: '$public'";
+  $status[] = t("Public File Folder: '%public'", array('%public' => $public));
   $private_path = _private_upload_path();
-  $output = "Private File Folder: '$private_path'";
+  $output = t("Private File Folder: '%private_path'", array('%private_path' => $private_path));
   $status[] = $output;
   
   // get status messages from the requirements hook.
@@ -529,7 +531,7 @@ function private_upload_admin() {
                      'WHERE na.gid != 0 AND f.filepath NOT LIKE \'%s%%\'', $private_path));
   if( $count ) {
     $status[] = t("There are !count public files attached to private nodes. ", array('!count'=>$count)).
-                l( 'Click here to make them all private.', 'admin/private_upload/migrate_private');
+                l(t('Click here to make them all private.'), 'admin/private_upload/migrate_private');
   }
   else {
     $status[] = t("There are no public files attached to private nodes. Great.");
@@ -668,7 +670,7 @@ function theme_private_upload_attachments($files) {
       if ($file->list && !$file->remove) {
         $href = _private_upload_create_url($file); // this is the changed line
         $text = $file->description ? $file->description : $file->filename;
-        $rows[] = array(l($text, $href), format_size($file->filesize));
+        $rows[] = array(l(check_plain($text), $href), format_size($file->filesize));
       }
     }
     if (count($rows)) {
@@ -848,7 +850,7 @@ function private_upload_views_handler_all_files($fieldinfo, $fielddata, $value,
       $links[] = check_plain($display_string);
     } else {
 //      $links[] = l($display_string, check_url(file_create_url($file->filepath))); // original
-      $links[] = l($display_string, _private_upload_create_url($file)); // the change
+      $links[] = l(check_plain($display_string), _private_upload_create_url($file)); // the change
     }
   }
   return implode(' | ', $links);