--- uieforum/uieforum.module	2008-03-09 19:36:35.000000000 +0100
+++ uieforum-org/uieforum.module	2008-01-10 00:20:05.000000000 +0100
@@ -199,7 +199,7 @@
     case "admin/content/".uieforum_get_module_menu_name():
       return t("This is a listing of the current forums withing the UIEForum module. You can Edit, or go directly to, any forum listed here.");
     case "admin/content/".uieforum_get_module_menu_name()."/security/list":
-      return t("The security tab is where the uieforum module's user access security system can be integrated with the drupal system. Note that until the actual forums to be restricted have had the relevant security settings applied, these will have no effect.<br /><br />It is <strong>strongly</strong> recommended (ie: just don't) not to modify groups 1, 2 or3 in <strong>any</strong> way at all.<br /><br />Each entry must have a GroupShortName that is unique to all other groups, and a Secured-Group Name, that is unique to all other entries within Drupal's access control system.<br /><br />To add extra moderator groups, ensure that the Secured-Group Name of that group begins with 'moderate @sec_name_NUM_@sec_name') - The 'moderate @sec_name ' part is hard coded, and is neccessary to allow members of a group to have moderator priviledges, and the NUM is the id of the forum that the group is to be a moderator of", array("@sec_name"=>uieforum_get_module_security_name()));
+      return t("The security tab is where the uieforum module's user access security system can be integrated with the drupal system. Note that until the actual forums to be restricted have had the relevant security settings applied, these will have no effect.<br /><br />It is <strong>strongly</strong> recommended (ie: just don't) not to modify groups 1, 2 or3 in <strong>any</strong> way at all.<br /><br />Each entry must have a GroupShortName that is unique to all other groups, and a Secured-Group Name, that is unique to all other entries within Drupal's access control system.<br /><br />To add extra moderator groups, ensure that the Secured-Group Name of that group begins with 'moderate ' (eg: 'moderate ".uieforum_get_module_security_name()."_NUM_"."_".uieforum_get_module_security_name()."') - The 'moderate ".uieforum_get_module_security_name()." ' part is hard coded, and is neccessary to allow members of a group to have moderator priviledges, and the NUM is the id of the forum that the group is to be a moderator of");
     case "admin/content/".uieforum_get_module_menu_name()."/edit/thread":
       return t("Here you can edit a thread's title, parent forum, and it's locked/sticky status.<br />Note, that delete a thread, also deletes all posts withing that thread - this action can <strong>NOT</strong> be done.");
     case "admin/content/".uieforum_get_module_menu_name()."/split/thread":
@@ -353,7 +353,7 @@
 */
   $output["Misc"]['uieforum_auto_greet'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Enable auto-greeting post for new forums'),
+    '#title' => 'Enable auto-greeting post for new forums',
     '#description' => t("(default: enabled)"),
     '#return_value' => 1,
     '#default_value' => variable_get('uieforum_auto_greet', 1),
@@ -361,7 +361,7 @@
 
   $output["Misc"]['uieforum_allow_display_avatars'] = array(
     '#type' => 'checkbox',
-    '#title' => t('UIEForum-wide avatar control. Enable/Disable avatars here'),
+    '#title' => 'UIEForum-wide avatar control. Enable/Disable avatars here',
     '#description' => t("(default: enabled)"),
     '#return_value' => 1,
     '#default_value' => variable_get('uieforum_allow_display_avatars', 1),
@@ -394,7 +394,7 @@
   $output["Paths"] = array(
     '#type' => 'fieldset',
     '#title' => t("Paths"),
-    '#description' => t('Set the various paths for ').uieforum_get_module_name(),
+    '#description' => t('Set the various paths for '.uieforum_get_module_name()),
     '#attributes' => null,
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
@@ -406,7 +406,7 @@
     '#default_value' => variable_get('uieforum_module_name', uieforum_get_module_name()),
     '#size' => 30,
     '#maxlength' => 255,
-    '#description' => t('The path to the forum in urls. Arguably one of the most important, and useful, settings. Leave blank (or as default - @name) for the default value. This value is used for access your forum: http://www.yoursite.com/THISVALUE - By setting this to "forum" you can simply swap over from using the default drupal forum, to using this one, in seconds. Don\'t add slashes, just leave it as if it is a single "folder". You can set this almost anything, but it is advised that you use only normal, one-word, words :)',array("@name"=>uieforum_get_module_name())),
+    '#description' => t('The path to the forum in urls. Arguably one of the most important, and useful, settings. Leave blank (or as default - '.uieforum_get_module_name().') for the default value. This value is used for access your forum: http://www.yoursite.com/THISVALUE - By setting this to "forum" you can simply swap over from using the default drupal forum, to using this one, in seconds. Don\'t add slashes, just leave it as if it is a single "folder". You can set this almost anything, but it is advised that you use only normal, one-word, words :)'),
   );
 
 
@@ -416,7 +416,7 @@
     '#default_value' => variable_get('forum_icon_path', 'sites/all/modules/'.uieforum_get_module_name().'/uie'),
     '#size' => 30,
     '#maxlength' => 255,
-    '#description' => t('The path to the forum icons.  Leave blank to disable icons. Don\'t add a trailing slash.  Default icons are available in the "sites/all/modules/@name/uie" directory. You may use images of whatever size you wish, but it is recommended to use 15x15 or 16x16. ',array("@name"=>uieforum_get_module_name())),
+    '#description' => t('The path to the forum icons.  Leave blank to disable icons. Don\'t add a trailing slash.  Default icons are available in the "sites/all/modules/'.uieforum_get_module_name().'/uie" directory. You may use images of whatever size you wish, but it is recommended to use 15x15 or 16x16. '),
   );
 
   $output["Paths"]['forum_smilies_icon_path'] = array(
@@ -425,7 +425,7 @@
     '#default_value' => variable_get('forum_smilies_icon_path', 'sites/all/modules/'.uieforum_get_module_name().'/uie/uiesmilies'),
     '#size' => 30,
     '#maxlength' => 255,
-    '#description' => t('The path to the forum smilies.  Don\'t add a trailing slash.  Default icons are available in the "sites/all/modules/@name/uie/uiesmilies" directory.',array("@name"=>uieforum_get_module_name())),
+    '#description' => t('The path to the forum smilies.  Don\'t add a trailing slash.  Default icons are available in the "sites/all/modules/'.uieforum_get_module_name().'/uie/uiesmilies" directory.'),
   );
 
   $output["Paths"]['forum_formatting_icon_path'] = array(
@@ -434,7 +434,7 @@
     '#default_value' => variable_get('forum_formatting_icon_path', 'sites/all/modules/'.uieforum_get_module_name().'/uie/textformatting'),
     '#size' => 30,
     '#maxlength' => 255,
-    '#description' => t('The path to the forum text formatting (bbcode) images. Don\'t add a trailing slash.  Default icons are available in the "sites/all/modules/@name/uie/textformatting" directory.',array("@name"=>uieforum_get_module_name())),
+    '#description' => t('The path to the forum text formatting (bbcode) images. Don\'t add a trailing slash.  Default icons are available in the "sites/all/modules/'.uieforum_get_module_name().'/uie/textformatting" directory.'),
   );
 
 
@@ -806,49 +806,49 @@
 
   $output["Performance Options"]['uieforum_use_smilies'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Enable Smilies'),
+    '#title' => 'Enable Smilies',
     '#return_value' => 1,
     '#default_value' => variable_get('uieforum_use_smilies', 1),
   );
 
   $output["Performance Options"]['uieforum_online_status'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Enable online status indicator'),
+    '#title' => 'Enable online status indicator',
     '#return_value' => 1,
     '#default_value' => variable_get('uieforum_online_status', 1),
   );
 
   $output["Performance Options"]['uieforum_ranks'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Enable user ranks'),
+    '#title' => 'Enable user ranks',
     '#return_value' => 1,
     '#default_value' => variable_get('uieforum_ranks', 1),
   );
 
   $output["Performance Options"]['uieforum_show_registered'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Enable registered-date display'),
+    '#title' => 'Enable registered-date display',
     '#return_value' => 1,
     '#default_value' => variable_get('uieforum_show_registered', 1),
   );
 
   $output["Performance Options"]['uieforum_show_sigs'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Enable signatures'),
+    '#title' => 'Enable signatures',
     '#return_value' => 1,
     '#default_value' => variable_get('uieforum_show_sigs', 1),
   );
 
   $output["Performance Options"]['uieforum_user_post_counts'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Enable (user) post counts'),
+    '#title' => 'Enable (user) post counts',
     '#return_value' => 1,
     '#default_value' => variable_get('uieforum_user_post_counts', 1),
   );
 /*
   $output2['uieforum_forums_threadpost_counts'] = array(
   '#type' => 'checkbox',
-  '#title' => t('Enable (forum) thread + post counts'),
+  '#title' => 'Enable (forum) thread + post counts',
   '#return_value' => 1,
   '#default_value' => variable_get('uieforum_forums_threadpost_counts', 1),
 );
@@ -869,7 +869,7 @@
   );
   $output["Performance Options"]["BBCode filter"]['uieforum_use_bbcode'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Enable BBCode'),
+    '#title' => 'Enable BBCode',
     '#return_value' => 1,
     '#default_value' => variable_get('uieforum_use_bbcode', 1),
   );
@@ -1655,7 +1655,7 @@
 
   $form['Locked'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Forum Locked (Posting not allowed in this forum if box is ticked).<div class="description">Note that this is <strong>not</strong> recursive. This will <strong>not</strong> affect forums contained within this one.</div>'),
+    '#title' => 'Forum Locked (Posting not allowed in this forum if box is ticked).<div class="description">Note that this is <strong>not</strong> recursive. This will <strong>not</strong> affect forums contained within this one.</div>',
     '#return_value' => 1,
     '#default_value' => $edit['Locked'],
   );
@@ -1702,7 +1702,7 @@
       {
        $form["Access Control"][$all->GroupShortName] = array(
          '#type' => 'checkbox',
-         '#title' => t('Access for group: "').$all->GroupName.'"',
+         '#title' => 'Access for group: \''.$all->GroupName.'\'',
          '#return_value' => 1,
          '#default_value' => $has_acc,
          '#name' => str_replace( " ", "__", $all->GroupShortName),
@@ -1731,7 +1731,7 @@
     foreach ($groups as $g) {
       $form["Access Control"][$g->GroupShortName] = array(
           '#type' => 'checkbox',
-          '#title' => t('Access for group: "').$g->GroupName.'"',
+          '#title' => 'Access for group: \''.$g->GroupName.'\'',
           '#return_value' => 1,
           '#default_value' => 0,
           '#name' => str_replace( " ", "__", $all->GroupShortName),
@@ -2104,7 +2104,7 @@
   $form = _uieforum_merge_select($form, $Thread->ForumID, $Post->ThreadID, t('Move to'), 'MovePost');
 
   return confirm_form($form, 
-                      t('Are you sure you want to move the post \'%name\'?', array('%name' => $PostID)),
+                      t('Are you sure you want to move the post \'%name\'?', array('%name' => t($PostID))),
                       'admin/content/'.uieforum_get_module_menu_name(),
                       t('Moving a post is not permanent. This action can be undone by moving the post back to its original thread.'),
                       'move',
@@ -2319,7 +2319,7 @@
   {
     case 'name':
       if (user_access('access '.uieforum_get_module_security_name()))
-        return uieforum_get_module_menu_name();
+        return t(uieforum_get_module_menu_name());
     case 'search':
       uieforum_process();
       if (user_access('access '.uieforum_get_module_security_name()))
@@ -2536,7 +2536,7 @@
       return array(0 => uieforum_get_module_name().' BBCode + Smilies');
 
     case 'description':
-      return t('Converts BBCode to html for the @name module, as well as taking care of the smilies',array("@name"=>uieforum_get_module_name()));
+      return t('Converts BBCode to html for the '.uieforum_get_module_name().' module, as well as taking care of the smilies');
 
     case 'process':
       if ($force_check)