--- uieforum/functions.inc.php	2008-03-09 18:19:27.000000000 +0100
+++ uieforum-org/functions.inc.php	2008-01-10 01:49:56.000000000 +0100
@@ -9,14 +9,14 @@
   if ($posts == NULL || !isset($user->uid)) { return NULL; }
 
   switch ($posts) {
-    case $posts <= 10: return variable_get('forum_rank_first', t('n00b') );
-    case $posts <= 100:  return variable_get('forum_rank_second', t('Killing Spree') );
-    case $posts <= 500:  return variable_get('forum_rank_third', t('Rampage') );
-    case $posts <= 1000: return variable_get('forum_rank_fourth', t('Dominating') );
-    case $posts <= 4000: return variable_get('forum_rank_fifth', t('Unstoppable') );
-    case $posts <= 5000: return variable_get('forum_rank_sixth', t('Godlike') );
-    case $posts < 7000: return variable_get('forum_rank_seventh', t('Wicked Sick') );
-    case $posts >= 7000: return variable_get('forum_rank_eighth', t('Oh Emm Gee') );
+    case $posts <= 10: return t( variable_get('forum_rank_first', 'n00b') );
+    case $posts <= 100:  return t( variable_get('forum_rank_second', 'Killing Spree') );
+    case $posts <= 500:  return t( variable_get('forum_rank_third', 'Rampage') );
+    case $posts <= 1000: return t( variable_get('forum_rank_fourth', 'Dominating') );
+    case $posts <= 4000: return t( variable_get('forum_rank_fifth', 'Unstoppable') );
+    case $posts <= 5000: return t( variable_get('forum_rank_sixth', 'Godlike') );
+    case $posts < 7000: return t( variable_get('forum_rank_seventh', 'Wicked Sick') );
+    case $posts >= 7000: return t( variable_get('forum_rank_eighth', 'Oh Emm Gee') );
   }
 }
 
@@ -878,7 +878,7 @@
 
   $obj = db_fetch_object($query);
   if(variable_get('uieforum_auto_greet', 1))
-    uieforum_create_thread(t("Welcome to ").$ForumName, t("This is the first thread in your new forum. You can disable this auto-greeting post by disabling the relevant option on the configure page."), $obj->id);
+    uieforum_create_thread("Welcome to ".$ForumName, "This is the first thread in your new forum. You can disable this auto-greeting post by disabling the relevant option on the configure page.", $obj->id);
 }
 
 /** Deletes a post
@@ -921,7 +921,7 @@
 function uieforum_move_post($PostID, $ThreadID)
 {
   $Post = uieforum_get_post($PostID);
-  if( !$PostID || !$ThreadID ){ trigger_error(t('Unable to move post - did you select a post or a thread to move it to?')); return false;}
+  if( !$PostID || !$ThreadID ){ trigger_error('Unable to move post - did you select a post or a thread to move it to?'); return false;}
 
   $query = db_query("UPDATE {f_posts} SET ThreadID=%d WHERE PostID=%d", $ThreadID, $PostID);
 
@@ -1052,7 +1052,7 @@
 {
   $query = db_query("SELECT ForumID FROM {f_forums} WHERE ForumID=%d", $fid);
   if ($query == NULL)
-    return t("No such forum exists.");
+    return "No such forum exists.";
 
   $q="UPDATE {f_forums} SET ForumName='%s', ForumDesc='%s', weight='%d', Locked='%d' ";
   if($ForumParent)
@@ -1197,7 +1197,7 @@
       if($show_ranks)
       {
 	      if($Poster->uid == 1)
-          $userrank = t('Super Admin');
+          $userrank = 'Super Admin';
 	      else
           $userrank = uieforum_user_rank(uieforum_uie_storage('postcount', $Poster->uid));
         if($userrank != null)
@@ -1210,7 +1210,7 @@
       {
         $userpostcount = uieforum_uie_storage('postcount', $Poster->uid);
         if($userpostcount != null)
-          $post_content[0]['data'] .= "<br />".t("Posts: ").$userpostcount."<br /><br />";
+          $post_content[0]['data'] .= "<br/>Posts: $userpostcount<br /><br />";
       }
       if($show_online_status)
       {
@@ -1219,7 +1219,7 @@
       }
       if($user->uid || variable_get('forum_report_post_guest_allow', 0))
       {
-        $alt = t('Report post to an Admin/Moderator');
+        $alt = 'Report post to an Admin/Moderator';
         $file = variable_get('forum_icon_path', 'sites/all/modules/'.uieforum_get_module_name().'/uie')."/forum-report.gif";
         $reportPostImage = theme('image', $file, $alt, $alt, '', false);
 
@@ -1258,12 +1258,12 @@
     {
       $tempuser = get_user_from_id($editedpost[0]);
       $DEFAULT_EDIT_REASON = trim(uieforum_filter('process', null, null, variable_get('forum_default_edit_reason', ''), true));
-      $outputtext = t("Last edited by ").$tempuser->name." (".uieforum_parse_date($editedpost[1]).")";
+      $outputtext = "Last edited by ".$tempuser->name." (".uieforum_parse_date($editedpost[1]).")";
 
       $edited_reason = uieforum_filter('process', null, null, $editedpost[2], true);
       if(strlen(trim($edited_reason)) <= 0) $edited_reason = $DEFAULT_EDIT_REASON;
       if(strlen($edited_reason) > 0)
-        $outputtext .= t(" Reason: ").$edited_reason;
+        $outputtext .= " Reason: ".$edited_reason;
       $post_content[1]['data'] .= "<hr /><div class='uie_edit_text'><em>".$outputtext."</em></div>";
     }
   }
@@ -1380,47 +1380,47 @@
   $uie_rows = array();
 	if(variable_get("uieforum_create_post_display_bbcode_bold", 1))
 	{
-    $uie_rows[] = array('data' => '<a href="javascript:Process(\'bold\')" alt=\''.t("Insert bold text").'\' title=\'Insert bold text\'>'._uieforum_icon(null, null, null, 'bold.gif', null, true).'</a>');
+    $uie_rows[] = array('data' => '<a href="javascript:Process(\'bold\')" alt=\'Insert bold text\' title=\'Insert bold text\'>'._uieforum_icon(null, null, null, 'bold.gif', null, true).'</a>');
 	}
 	if(variable_get("uieforum_create_post_display_bbcode_italic", 1))
 	{
-    $uie_rows[] = array('data' => '<a href="javascript:Process(\'italic\')" alt=\''.t("Insert italic text").'\' title=\'Insert italic text\'>'._uieforum_icon(null, null, null, 'italic.gif', null, true).'</a>');
+    $uie_rows[] = array('data' => '<a href="javascript:Process(\'italic\')" alt=\'Insert italic text\' title=\'Insert italic text\'>'._uieforum_icon(null, null, null, 'italic.gif', null, true).'</a>');
 	}
 	if(variable_get("uieforum_create_post_display_bbcode_underline", 1))
 	{
-    $uie_rows[] = array('data' => '<a href="javascript:Process(\'underline\')" alt=\''.t("Insert underlined text").'\' title=\'Insert underlined text\'>'._uieforum_icon(null, null, null, 'underline.gif', null, true).'</a>');
+    $uie_rows[] = array('data' => '<a href="javascript:Process(\'underline\')" alt=\'Insert underlined text\' title=\'Insert underlined text\'>'._uieforum_icon(null, null, null, 'underline.gif', null, true).'</a>');
 	}
 	if(variable_get("uieforum_create_post_display_bbcode_url", 1))
 	{
-    $uie_rows[] = array('data' => '<a href="javascript:Process(\'url\')" alt=\''.t("Insert a url").'\' title=\''.t("Insert a url").'\'>'._uieforum_icon(null, null, null, 'url.gif', null, true).'</a>');
+    $uie_rows[] = array('data' => '<a href="javascript:Process(\'url\')" alt=\'Insert a url\' title=\'Insert a url\'>'._uieforum_icon(null, null, null, 'url.gif', null, true).'</a>');
 	}
 	if(variable_get("uieforum_create_post_display_bbcode_image", 1))
 	{
-    $uie_rows[] = array('data' => '<a href="javascript:Process(\'image\')" alt=\''.t("Insert an inline image").'\' title=\''.t("Insert an inline image").'\'>'._uieforum_icon(null, null, null, 'image.gif', null, true).'</a>');
+    $uie_rows[] = array('data' => '<a href="javascript:Process(\'image\')" alt=\'Insert an inline image\' title=\'Insert an inline image\'>'._uieforum_icon(null, null, null, 'image.gif', null, true).'</a>');
 	}
 	if(variable_get("uieforum_create_post_display_bbcode_quote", 1))
 	{
-    $uie_rows[] = array('data' => '<a href="javascript:Process(\'quote\')" alt=\''.t("Insert quoted text").'\' title=\''.t("Insert quoted text").'\'>'._uieforum_icon(null, null, null, 'quote.gif', null, true).'</a>');
+    $uie_rows[] = array('data' => '<a href="javascript:Process(\'quote\')" alt=\'Insert quoted text\' title=\'Insert quoted text\'>'._uieforum_icon(null, null, null, 'quote.gif', null, true).'</a>');
 	}
 	if(variable_get("uieforum_create_post_display_bbcode_code", 1))
 	{
-    $uie_rows[] = array('data' => '<a href="javascript:Process(\'code\')" alt=\''.t("Insert pre-formatted code").'\' title=\''.t("Insert pre-formatted code").'\'>'._uieforum_icon(null, null, null, 'code.gif', null, true).'</a>');
+    $uie_rows[] = array('data' => '<a href="javascript:Process(\'code\')" alt=\'Insert pre-formatted code\' title=\'Insert pre-formatted code\'>'._uieforum_icon(null, null, null, 'code.gif', null, true).'</a>');
 	}
 	if(variable_get("uieforum_create_post_display_bbcode_rant", 1))
 	{
-    $uie_rows[] = array('data' => '<a href="javascript:Process(\'rant\')" alt=\''.t("Give out about something").'\' title=\''.t("Give out about something").'\'>'._uieforum_icon(null, null, null, 'rant.gif', null, true).'</a>');
+    $uie_rows[] = array('data' => '<a href="javascript:Process(\'rant\')" alt=\'Give out about something\' title=\'Give out about something\'>'._uieforum_icon(null, null, null, 'rant.gif', null, true).'</a>');
 	}
 	if(variable_get("uieforum_create_post_display_bbcode_left", 1))
 	{
-    $uie_rows[] = array('data' => '<a href="javascript:Process(\'left\')" alt=\''.t("Align paragraph to left").'\' title=\''.t("Align paragraph to left").'\'>'._uieforum_icon(null, null, null, 'align_left.jpg', null, true).'</a>');
+    $uie_rows[] = array('data' => '<a href="javascript:Process(\'left\')" alt=\'Align paragraph to left\' title=\'Align paragraph to left\'>'._uieforum_icon(null, null, null, 'align_left.jpg', null, true).'</a>');
 	}
 	if(variable_get("uieforum_create_post_display_bbcode_center", 1))
 	{
-    $uie_rows[] = array('data' => '<a href="javascript:Process(\'center\')" alt=\''.t("Align paragraph to center").'\' title=\''.t("Align paragraph to center").'\'>'._uieforum_icon(null, null, null, 'align_center.gif', null, true).'</a>');
+    $uie_rows[] = array('data' => '<a href="javascript:Process(\'center\')" alt=\'Align paragraph to center\' title=\'Align paragraph to center\'>'._uieforum_icon(null, null, null, 'align_center.gif', null, true).'</a>');
 	}
 	if(variable_get("uieforum_create_post_display_bbcode_right", 1))
 	{
-    $uie_rows[] = array('data' => '<a href="javascript:Process(\'right\')" alt=\''.t("Align paragraph to right").'\' title=\''.t("Align paragraph to right").'\'>'._uieforum_icon(null, null, null, 'align_right.jpg', null, true).'</a>');
+    $uie_rows[] = array('data' => '<a href="javascript:Process(\'right\')" alt=\'Align paragraph to right\' title=\'Align paragraph to right\'>'._uieforum_icon(null, null, null, 'align_right.jpg', null, true).'</a>');
 	}
   return array($uie_rows);
 }
@@ -1461,7 +1461,7 @@
       array('data' => '&nbsp;', 'class' => 'uieforumicon uieforum_nopadding'),
       array('data' => t('Thread'), 'class' => 'created uieheader'),
       array('data' => t('Replies'), 'class' => 'numposts uieheader'),
-      array('data' => t('Thread Views'), 'class' => 'numposts uieheader'),
+      array('data' => t('Views'), 'class' => 'numposts uieheader'),
       array('data' => t('Last Post'), 'class' => 'uieforum-last-reply uieheader')
     );
   }
@@ -2029,7 +2029,7 @@
 function uieforum_generate_post_admin_form($PostID, $ThreadID)
 {
 	$dropdownmenu = array(
-		null => $PostID,
+		null => t($PostID),
 		url('admin/content/'.uieforum_get_module_menu_name().'/edit/post/'.$PostID)."?destination=".$_SERVER['REDIRECT_QUERY_STRING'] => t('Delete Post'),
 		url('admin/content/'.uieforum_get_module_menu_name().'/edit/post/move/'.$PostID)."?destination=".$_SERVER['REDIRECT_QUERY_STRING'] => t('Move Post'),
 		url('admin/content/'.uieforum_get_module_menu_name().'/split/thread/'.$PostID)."?destination=".$_SERVER['REDIRECT_QUERY_STRING'] => t('Split Thread'),