Index: friendlist_blocks/friendlist_blocks.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/friendlist/friendlist_blocks/Attic/friendlist_blocks.module,v
retrieving revision 1.1.2.14
diff -u -p -r1.1.2.14 friendlist_blocks.module
--- friendlist_blocks/friendlist_blocks.module	2 Oct 2008 13:07:26 -0000	1.1.2.14
+++ friendlist_blocks/friendlist_blocks.module	9 Oct 2008 21:56:36 -0000
@@ -99,12 +99,7 @@ function friendlist_blocks_block($op = '
 
         // Block to display possible actions with the content's author
         if ($delta == 1) {
-          if (arg(0) == 'node' &&
-                is_numeric(arg(1)) &&
-                ($n = node_load(arg(1))) &&
-                ( $u = user_load( array('uid' => $n->uid))) &&
-                ($user->uid != $u->uid)
-            ) {
+          if ($n = menu_get_object('node') &&  $u = user_load(array('uid' => $n->uid)) && $user->uid != $u->uid) {
             $subject = t("You and !user", array('!user' => theme('username', $u)));
             $output = friendlist_ui_user_links($u);
           }
@@ -115,23 +110,8 @@ function friendlist_blocks_block($op = '
         // user being viewed
         if ($delta == 2) {
 
-          if (
-              (
-                arg(0) == 'node' &&
-                  is_numeric(arg(1)) &&
-                  ($n = node_load(arg(1))) &&
-                  ($u = user_load( array('uid' => $n->uid))) &&
-                  ($user->uid != $u->uid)
-                )
-                ||
-                (
-                arg(0) == 'user' &&
-                  is_numeric(arg(1)) &&
-                  ($u = user_load( arg(1) ) ) &&
-                  ($user->uid != $u->uid)
-                )
-            ) {
-
+          if (($n = menu_get_object('node') &&  $u = user_load(array('uid' => $n->uid)) && $user->uid != $u->uid)
+            || ($u = menu_get_object('user') && $user->uid != $u->uid)) {
               $subject = t("Common relations");
               $output = friendlist_blocks_contents_2($u);
           }
Index: friendlist_import_bl2/friendlist_import_bl2.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/friendlist/friendlist_import_bl2/Attic/friendlist_import_bl2.module,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 friendlist_import_bl2.module
--- friendlist_import_bl2/friendlist_import_bl2.module	3 Oct 2008 17:46:15 -0000	1.1.2.7
+++ friendlist_import_bl2/friendlist_import_bl2.module	9 Oct 2008 21:56:36 -0000
@@ -31,7 +31,7 @@ function friendlist_import_bl2_menu() {
  */
 function friendlist_import_bl2_form(&$form_state, $edit = NULL ) {
 
-  drupal_set_title("Buddylist2 data importer");
+  drupal_set_title(t("Buddylist2 data importer"));
 
   $form['info'] = array(
     '#value' => t('<h1>This is DESTRUCTIVE. YOU WILL LOSE ALL YOUR Friendlist DATA. WATCH OUT.</h1>')
@@ -52,7 +52,7 @@ function friendlist_import_bl2_form(&$fo
  * This function actually does all of the importing.
  */
 function friendlist_import_bl2_form_submit(&$form_state, $edit = NULL ) {
-  drupal_set_message("Done!");
+  drupal_set_message(t("Done!"));
 
   // Delete the existing relations and relation types
   db_query("DELETE FROM {friendlist_relation_types}");
Index: friendlist_ui/friendlist_ui.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/friendlist/friendlist_ui/friendlist_ui.admin.inc,v
retrieving revision 1.1.2.15
diff -u -p -r1.1.2.15 friendlist_ui.admin.inc
--- friendlist_ui/friendlist_ui.admin.inc	2 Oct 2008 11:37:02 -0000	1.1.2.15
+++ friendlist_ui/friendlist_ui.admin.inc	9 Oct 2008 21:56:37 -0000
@@ -222,7 +222,7 @@ function friendlist_ui_admin_settings() 
 
 
   $form['friendlist_ui_before_rebuild_status_cache'] = array(
-    '#value' => t('This button will rebuild the cache: '),
+    '#value' => t('This button will rebuild the cache:') . ' ',
   );
   $form['friendlist_ui_rebuild_status_cache'] = array(
     '#type' => 'submit',
@@ -271,7 +271,7 @@ function friendlist_ui_rebuild_confirm_s
   }
 
   $form_state['redirect'] = 'admin/settings/friendlist_ui';
-  drupal_set_message("DONE!");
+  drupal_set_message(t("DONE!"));
 
   return;
 }
Index: friendlist_ui/friendlist_ui.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/friendlist/friendlist_ui/friendlist_ui.module,v
retrieving revision 1.1.2.23
diff -u -p -r1.1.2.23 friendlist_ui.module
--- friendlist_ui/friendlist_ui.module	8 Oct 2008 16:34:08 -0000	1.1.2.23
+++ friendlist_ui/friendlist_ui.module	9 Oct 2008 21:56:37 -0000
@@ -222,12 +222,12 @@ function friendlist_ui_relation_form(&$f
   return $form;
 }
 
-function friendlist_ui_relation_form_validate($form, $form_state) {
+function friendlist_ui_relation_form_validate($form, &$form_state) {
   global $user;
   #drupal_set_message("Validation!");
 }
 
-function friendlist_ui_relation_form_submit($form_id, $form_state) {
+function friendlist_ui_relation_form_submit($form, &$form_state) {
   global $user;
 
   // Make the variable names bearable.