Index: user_relationship_defaults/user_relationship_defaults.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_relationships/user_relationship_defaults/Attic/user_relationship_defaults.module,v
retrieving revision 1.1.2.10
diff -u -p -r1.1.2.10 user_relationship_defaults.module
--- user_relationship_defaults/user_relationship_defaults.module	14 Aug 2009 21:05:02 -0000	1.1.2.10
+++ user_relationship_defaults/user_relationship_defaults.module	23 Sep 2009 00:35:26 -0000
@@ -170,7 +170,7 @@ function user_relationship_defaults_add_
 
   $message_p = array(
     '%username'           => $user->name,
-    '%relationship_name'  => $relationship_type->name,
+    '%relationship_name'  => tt("user_relationships:ui:$relationship_type->rtid:name", $relationship_type->name),
   );
   drupal_set_message(t('Default relationship %relationship_name of %username has been added.', $message_p));
   watchdog('u_relationship', 'Default relationship %relationship_name of %username has been added.', $message_p, WATCHDOG_NOTICE, l(t('view'), 'admin/user/relationships'));
@@ -191,7 +191,7 @@ function user_relationship_defaults_dele
   $form = confirm_form(
     $form,
     t('Are you sure you want to delete the default relationship %relationship of %name?', array(
-      '%relationship' => $default_relationship->relationship_type->name,
+      '%relationship' => tt("user_relationships:ui:$default_relationship->relationship_type->rtid:name", $default_relationship->relationship_type->name),
       '%name'         => $default_relationship->user->name,
     )),
     'admin/user/relationships',
@@ -211,7 +211,7 @@ function user_relationship_defaults_dele
   db_query("DELETE FROM {user_relationship_defaults} WHERE rdid = %d", $default_relationship->rdid);
   $message_p = array(
     '%name'         => $default_relationship->user_name,
-    '%relationship' => $default_relationship->name,
+    '%relationship' => tt("user_relationships:ui:$default_relationship->rtid:name", $default_relationship->name),
   );
   drupal_set_message(t('Default relationship %relationship of %name has been deleted.', $message_p));
   watchdog('u_relationship', 'Default relationship %relationship of %name has been deleted.', $message_p, WATCHDOG_NOTICE);
Index: user_relationships_api/user_relationships_api.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_relationships/user_relationships_api/Attic/user_relationships_api.module,v
retrieving revision 1.1.2.17
diff -u -p -r1.1.2.17 user_relationships_api.module
--- user_relationships_api/user_relationships_api.module	15 Aug 2009 21:10:26 -0000	1.1.2.17
+++ user_relationships_api/user_relationships_api.module	23 Sep 2009 00:35:26 -0000
@@ -247,3 +247,12 @@ function user_relationships_api_user($ty
    db_query("DELETE FROM {user_relationships} WHERE requester_id = %d OR requestee_id = %d", $account->uid, $account->uid);
  }
 }
+
+/**
+ * provide a degrade path for function tt found in module i18nstrings
+ */
+if (! module_exists('i18nstrings')) {
+  function tt($name, $string, $langcode = NULL, $update = FALSE) {
+    return t($string, array(), $langcode);
+  }
+}
Index: user_relationships_ui/user_relationships_ui.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_relationships/user_relationships_ui/Attic/user_relationships_ui.admin.inc,v
retrieving revision 1.1.2.16
diff -u -p -r1.1.2.16 user_relationships_ui.admin.inc
--- user_relationships_ui/user_relationships_ui.admin.inc	14 Aug 2009 20:08:47 -0000	1.1.2.16
+++ user_relationships_ui/user_relationships_ui.admin.inc	23 Sep 2009 00:35:26 -0000
@@ -220,7 +220,7 @@ function user_relationships_ui_type_dele
 
     return confirm_form(
       $form,
-      t('Are you sure you want to delete %name?', array('%name' => $relationship_type->name)),
+      t('Are you sure you want to delete %name?', array('%name' => tt("user_relationships:ui:$relationship_type->rtid:name", $relationship_type->name))),
       'admin/user/relationships',
       t('This action cannot be undone.'),
       t('Delete'), t('Cancel')
Index: user_relationships_ui/user_relationships_ui.forms.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_relationships/user_relationships_ui/Attic/user_relationships_ui.forms.inc,v
retrieving revision 1.1.2.15
diff -u -p -r1.1.2.15 user_relationships_ui.forms.inc
--- user_relationships_ui/user_relationships_ui.forms.inc	10 Jul 2009 07:27:49 -0000	1.1.2.15
+++ user_relationships_ui/user_relationships_ui.forms.inc	23 Sep 2009 00:35:26 -0000
@@ -132,7 +132,9 @@ function user_relationships_ui_request(&
       t('Request relationship'),
       "user/$requestee->uid",
       $relationship ?
-      ($relationship->requires_approval ? t('Are you sure you wish to send a new %rel_name request to %name?', array('%name' => $requestee->name, '%rel_name' => $relationship->name, '%rel_plural_name' => $relationship->plural_name)) : t("Are you sure you want to become %name's %rel_name?", array('%name' => $requestee->name, '%rel_name' => $relationship->name))) :
+      ($relationship->requires_approval 
+       ? t('Are you sure you wish to send a new %rel_name request to %name?', array('%name' => $requestee->name, '%rel_name' => tt("user_relationships:ui:$relationship->rtid:name", $relationship->name), '%rel_plural_name' => tt("user_relationships:ui:$relationship->rtid:plural_name", $relationship->plural_name))) 
+       : t("Are you sure you want to become %name's %rel_name?", array('%name' => $requestee->name, '%rel_name' => tt("user_relationships:ui:$relationship->rtid:name", $relationship->name)))) :
       t('How do you relate to %name?', array('%name' => $requestee->name)),
       t('Send'), t('Cancel'),
       'user_relationships_request_confirm'
@@ -177,7 +179,7 @@ function user_relationships_ui_pending_r
     case 'approve':
       $confirmation_message = t('Are you sure you want to approve the %relationship_name relationship request from !name?', array(
         '@action'             => $action,
-        '%relationship_name'  => $relationship->name,
+        '%relationship_name'  => tt("user_relationships:ui:$relationship->rtid:name", $relationship->name),
         '!name'               => theme('username', user_load(array('uid' => ($viewed_id == $relationship->requester_id ? $relationship->requestee_id : $relationship->requester_id))))
       ));
       $action_message = t('Approve relationship');
@@ -185,7 +187,7 @@ function user_relationships_ui_pending_r
     case 'disapprove':
       $confirmation_message = t('Are you sure you want to disapprove the %relationship_name relationship request from !name?', array(
         '@action'             => $action,
-        '%relationship_name'  => $relationship->name,
+        '%relationship_name'  => tt("user_relationships:ui:$relationship->rtid:name", $relationship->name),
         '!name'               => theme('username', user_load(array('uid' => ($viewed_id == $relationship->requester_id ? $relationship->requestee_id : $relationship->requester_id))))
       ));
       $action_message = t('Disapprove relationship');
@@ -193,7 +195,7 @@ function user_relationships_ui_pending_r
     default:
       $confirmation_message = t('Are you sure you want to cancel your %relationship_name relationship request to !name?', array(
         '@action'             => $action,
-        '%relationship_name'  => $relationship->name,
+        '%relationship_name'  => tt("user_relationships:ui:$relationship->rtid:name", $relationship->name),
         '!name'               => theme('username', user_load(array('uid' => ($viewed_id == $relationship->requester_id ? $relationship->requestee_id : $relationship->requester_id))))
       ));
       $action_message = t('Cancel relationship');
@@ -252,7 +254,7 @@ function user_relationships_ui_remove(&$
     ($viewed_id == $user->id ? 'relationships' : "user/{$viewed_id}/relationships/"),
 
     t("Are you sure you wish to delete the %relationship_name relationship with !name?", array(
-      '%relationship_name'  => $relationship->name,
+      '%relationship_name'  => tt("user_relationships:ui:$relationship->rtid:name", $relationship->name),
       '!name'               => theme('username', user_load(array('uid' => ($viewed_id == $relationship->requester_id ? $relationship->requestee_id : $relationship->requester_id))))
     )),
     t('Yes'), t('No'),
Index: user_relationships_ui/user_relationships_ui.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_relationships/user_relationships_ui/Attic/user_relationships_ui.module,v
retrieving revision 1.1.2.26
diff -u -p -r1.1.2.26 user_relationships_ui.module
--- user_relationships_ui/user_relationships_ui.module	14 Aug 2009 20:08:47 -0000	1.1.2.26
+++ user_relationships_ui/user_relationships_ui.module	23 Sep 2009 00:35:26 -0000
@@ -44,8 +44,12 @@ function user_relationships_ui_get_messa
     $replaceables = array(
       '!requester'                => theme('username', $relationship->requester),
       '!requestee'                => theme('username', $relationship->requestee),
-      '%relationship_name'        => $relationship->name ? $relationship->name : $relationship->type->name,
-      '%relationship_plural_name' => $relationship->plural_name ? $relationship->plural_name : $relationship->type->plural_name,
+      '%relationship_name'        => $relationship->name 
+                                     ? tt("user_relationships:ui:$relationship->rtid:name", $relationship->name) 
+                                     : tt("user_relationships:ui:$relationship->rtid:name", $relationship->type->name),
+      '%relationship_plural_name' => $relationship->plural_name 
+                                     ? tt("user_relationships:ui:$relationship->rtid:plural_name", $relationship->plural_name) 
+                                     : tt("user_relationships:ui:$relationship->rtid:plural_name", $relationship->type->plural_name),
     );
     $replacements = array_merge($replaceables, $replacements);
   }
@@ -176,9 +180,9 @@ function _user_relationships_ui_set_noti
 function _user_relationships_ui_autocomplete_types($string = '') {
   $matches = array();
   if ($string) {
-    $result = db_query_range("SELECT name FROM {user_relationship_types} WHERE LOWER(name) LIKE LOWER('%%%s%%')", strtolower($string), 0, 10);
+    $result = db_query_range("SELECT rtid, name FROM {user_relationship_types} WHERE LOWER(name) LIKE LOWER('%%%s%%')", strtolower($string), 0, 10);
     while ($relationship = db_fetch_object($result)) {
-      $matches[$relationship->name] = check_plain($relationship->name);
+      $matches[$relationship->name] = check_plain(tt("user_relationships:ui:$relationship->rtid:name", $relationship->name));
    }
   }
   print drupal_to_js($matches);
@@ -195,7 +199,7 @@ function _user_relationships_ui_between(
   foreach ($relationships as $relationship) {
     if ($relationship->approved && !$list[$relationship->rid]) {
       $list[$relationship->rid] = t('%relationship_name (!remove_link)', array(
-        '%relationship_name'  => $relationship->name . ($relationship->is_oneway ? ($relationship->requester_id == $viewer->uid ? t(' (You to Them)') : t(' (Them to You)')) : NULL),
+        '%relationship_name'  => tt("user_relationships:ui:$relationship->rtid:name", $relationship->name) . ($relationship->is_oneway ? ($relationship->requester_id == $viewer->uid ? t(' (You to Them)') : t(' (Them to You)')) : NULL),
         '!remove_link'        => theme('user_relationships_remove_link', $viewer->uid, $relationship->rid)
       ));
     }
@@ -218,7 +222,7 @@ function _user_relationships_ui_actions_
   $relationships = user_relationships_load(array('requester_id' => $viewer->uid, 'requestee_id' => $viewed->uid, 'approved' => FALSE));
   foreach ($relationships as $relationship) {
     $list[] = t('You have sent a new %relationship_name request to this user. (!pending_requests)', array(
-      '%relationship_name'  => $relationship->name,
+      '%relationship_name'  => tt("user_relationships:ui:$relationship->rtid:name", $relationship->name),
       '!pending_requests'   => l(t('pending requests'), "relationships/requests"),
     ));
   }
@@ -226,7 +230,7 @@ function _user_relationships_ui_actions_
   $relationships = user_relationships_load(array('requester_id' => $viewed->uid, 'requestee_id' => $viewer->uid, 'approved' => FALSE));
   foreach ($relationships as $relationship) {
     $list[] = t('This user has requested to be your %relationship_name. (!pending_requests)', array(
-      '%relationship_name'  => $relationship->name,
+      '%relationship_name'  => tt("user_relationships:ui:$relationship->rtid:name", $relationship->name),
       '!pending_requests'   => l(t('pending requests'), "user/{$viewer->uid}/relationships/requests"),
     ));
   }
@@ -307,7 +311,7 @@ function _user_relationships_ui_get_requ
     if (!user_relationships_api_can_request($requester, $rtype)) {
       continue;
     }
-    $relationships[$rtype->rtid] = $rtype->name;
+    $relationships[$rtype->rtid] = tt("user_relationships:ui:$rtype->rtid:name", $rtype->name);
   }
   return $relationships;
 }
@@ -351,7 +355,7 @@ function user_relationships_ui_check_acc
  **********************************/
 
 /**
- * Help
+ * Implementation of hook_help().
  */
 function user_relationships_ui_help($section) {
   switch ($section) {
@@ -366,7 +370,7 @@ function user_relationships_ui_help($sec
 }
 
 /**
- * Init
+ * Implementation of hook_init().
  */
 function user_relationships_ui_init() {
   drupal_add_js(USER_RELATIONSHIPS_UI_PATH .'/user_relationships_ui.js');
@@ -382,7 +386,7 @@ function user_relationships_ui_init() {
 }
 
 /**
- * Perm
+ * Implementation of hook_perm().
  */
 function user_relationships_ui_perm() {
   return array(
@@ -393,7 +397,7 @@ function user_relationships_ui_perm() {
 }
 
 /**
- * Footer
+ * Implementation of hook_footer().
  */
 function user_relationships_ui_footer($main = 0) {
   // This is the div we are utilizing for the form popups for confirmation.
@@ -401,7 +405,7 @@ function user_relationships_ui_footer($m
 }
 
 /**
- * Menu
+ * Implementation of hook_menu().
  */
 function user_relationships_ui_menu() {
   include_once(drupal_get_path('module', 'user_relationships_api') .'/user_relationships_api.module');
@@ -497,7 +501,7 @@ function user_relationships_ui_menu() {
     );
     foreach (user_relationships_types_load() as $rtid => $relationship) {
       $items["relationships/{$rtid}"] = array(
-        'title'             => $relationship->plural_name ? $relationship->plural_name : $relationship->name,
+        'title'             => $relationship->plural_name ? tt("user_relationships:ui:$rtid:plural_name", $relationship->plural_name) : tt("user_relationships:ui:$rtid:name", $relationship->name),
         'type'              => MENU_NORMAL_ITEM|MENU_LOCAL_TASK,
         'access callback'   => 'user_relationships_ui_check_access',
         'access arguments'  => array('edit'),
@@ -556,7 +560,7 @@ function user_relationships_ui_menu() {
 
     foreach (user_relationships_types_load() as $rtid => $relationship) {
       $items["user/%user/relationships/{$rtid}"] = array(
-        'title'             => $relationship->plural_name ? $relationship->plural_name : $relationship->name,
+        'title'             => $relationship->plural_name ? tt("user_relationships:ui:$rtid:plural_name", $relationship->plural_name) : tt("user_relationships:ui:$rtid:name", $relationship->name),
         'type'              => MENU_NORMAL_ITEM|MENU_LOCAL_TASK,
         'access callback'   => 'user_relationships_ui_check_access',
         'access arguments'  => array(array('admin', 'user'), 1),
@@ -592,7 +596,7 @@ function user_relationships_ui_menu() {
 }
 
 /**
- * User
+ * Implementation of hook_user().
  */
 function user_relationships_ui_user($type, &$edit, &$account, $category = NULL) {
   switch ($type) {
@@ -659,7 +663,7 @@ function user_relationships_ui_user($typ
         $options = array();
         foreach ($relationships as $relationship) {
           if ($relationship->requires_approval) {
-            $options[$relationship->rtid] = $relationship->name;
+            $options[$relationship->rtid] = tt("user_relationships:ui:$relationship->rtid:name", $relationship->name);
           }
         }
         $form['user_relationships_ui_settings']['user_relationships_ui_auto_approve'] = array(
@@ -705,9 +709,18 @@ function user_relationships_ui_user($typ
   }
 }
 
+/**
+ * Implementation of hook_locale().
+ */
+function user_relationships_ui_locale($op = 'groups') {
+  switch ($op) {
+    case 'groups':
+      return array('user_relationships' => t('User Relationships'));
+  }
+}
 
 /**
- * Theme
+ * Implementation of hook_theme().
  */
 function user_relationships_ui_theme() {
   $theme_funcs = array(
@@ -797,10 +810,14 @@ function template_preprocess_user_relati
   }
 
   if ($account->uid == $user->uid) {
-    $msg = $relationship_type ? t("My %relationships", array('%relationships' => $relationship_type->plural_name ? $relationship_type->plural_name : $relationship_type->name)) : t("All my relationships");
+    $msg = $relationship_type 
+           ? t("My %relationships", array('%relationships' => $relationship_type->plural_name ? tt("user_relationships:ui:$relationship_type->rtid:plural_name", $relationship_type->plural_name) : tt("user_relationships:ui:$relationship_type->rtid:name", $relationship_type->name))) 
+           : t("All my relationships");
   }
   else {
-    $msg = $relationship_type ? t("%username's %relationships", array('%username' => $account->name, '%relationships' => $relationship_type->plural_name ? $relationship_type->plural_name : $relationship_type->name)) : t("All %username's relationships", array('%username' => $account->name));
+    $msg = $relationship_type 
+           ? t("%username's %relationships", array('%username' => $account->name, '%relationships' => $relationship_type->plural_name ? tt("user_relationships:ui:$relationship_type->rtid:plural_name", $relationship_type->plural_name) : tt("user_relationships:ui:$relationship_type->rtid:name", $relationship_type->name))) 
+           : t("All %username's relationships", array('%username' => $account->name));
   }
 
   $variables['title'] = $msg;
Index: user_relationships_ui/user_relationships_ui.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_relationships/user_relationships_ui/Attic/user_relationships_ui.theme.inc,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 user_relationships_ui.theme.inc
--- user_relationships_ui/user_relationships_ui.theme.inc	6 Jul 2009 20:22:33 -0000	1.1.2.7
+++ user_relationships_ui/user_relationships_ui.theme.inc	23 Sep 2009 00:35:26 -0000
@@ -36,7 +36,7 @@ function theme_user_relationships_reques
     return theme('user_relationships_request_relationship_link', $relate_to);
   }
   return l(
-    t("Become %name's %rel_name", array('%name' => $relate_to->name, '%rel_name' => $relationship_type->name, '%rel_plural_name' => $relationship_type->plural_name)),
+    t("Become %name's %rel_name", array('%name' => $relate_to->name, '%rel_name' => tt("user_relationships:ui:$relationship_type:name", $relationship_type->name), '%rel_plural_name' => tt("user_relationships:ui:$relationship_type:plural_name", $relationship_type->plural_name))),
     "relationship/{$relate_to->uid}/request/{$relationship_type->rtid}",
     array(
       'query' => drupal_get_destination(),
Index: user_relationships_ui/templates/user_relationships.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_relationships/user_relationships_ui/templates/Attic/user_relationships.tpl.php,v
retrieving revision 1.1.2.7
diff -u -p -r1.1.2.7 user_relationships.tpl.php
--- user_relationships_ui/templates/user_relationships.tpl.php	24 Mar 2009 08:46:35 -0000	1.1.2.7
+++ user_relationships_ui/templates/user_relationships.tpl.php	23 Sep 2009 00:35:26 -0000
@@ -11,7 +11,7 @@ if ($relationships) {
 
     $row = array(
       theme('username', $this_user),
-      $relationship->name . ($relationship->is_oneway ? ($this_user_str == 'requester' ? t(' (You to Them)') : t(' (Them to You)')) : NULL),
+      tt("user_relationships:ui:$relationship->rtid:name", $relationship->name) . ($relationship->is_oneway ? ($this_user_str == 'requester' ? t(' (You to Them)') : t(' (Them to You)')) : NULL),
       $relationship->extra_for_display,
       $edit_access ? theme('user_relationships_remove_link', $account->uid, $relationship->rid) : ' ',
     );
Index: user_relationships_ui/templates/user_relationships_pending_requests.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/user_relationships/user_relationships_ui/templates/Attic/user_relationships_pending_requests.tpl.php,v
retrieving revision 1.1.2.6
diff -u -p -r1.1.2.6 user_relationships_pending_requests.tpl.php
--- user_relationships_ui/templates/user_relationships_pending_requests.tpl.php	24 Mar 2009 08:46:35 -0000	1.1.2.6
+++ user_relationships_ui/templates/user_relationships_pending_requests.tpl.php	23 Sep 2009 00:35:26 -0000
@@ -32,10 +32,10 @@
       $links = implode(' | ', $links);
 
       if ($relationship->requester_id == $account->uid) {
-        $rows[]   = array(t('@rel_name to !requestee', array('@rel_name' => $relationship->name, '!requestee' => theme('username', $relationship->requestee))), $links);
+        $rows[]   = array(t('@rel_name to !requestee', array('@rel_name' => tt("user_relationships:ui:$relationship->rtid:name", $relationship->name), '!requestee' => theme('username', $relationship->requestee))), $links);
       }
       else {
-        $rows[]   = array(t('@rel_name from !requester', array('@rel_name' => $relationship->name, '!requester' => theme('username', $relationship->requester))), $links);
+        $rows[]   = array(t('@rel_name from !requester', array('@rel_name' => tt("user_relationships:ui:$relationship->rtid:name", $relationship->name), '!requester' => theme('username', $relationship->requester))), $links);
       }
     }