--- uc_attribute.module	2008-09-17 23:38:39.000000000 +0200
+++ uc_attribute_new.module	2008-10-06 10:51:28.000000000 +0200
@@ -719,10 +719,10 @@ function uc_object_attributes_form($id, 
             '#default_value' => 0,
           ),
           'name' => array(
-            '#value' => $attribute->name,
+            '#value' => t($attribute->name),
           ),
           'option' => array(
-            '#value' => $option ? ($option->name .' ('. uc_currency_format($option->price) .')' ) : t('n/a'),
+            '#value' => $option ? (t($option->name) .' ('. uc_currency_format($option->price) .')' ) : t('n/a'),
           ),
           'required' => array(
             '#type' => 'checkbox',
@@ -911,7 +911,7 @@ function uc_object_options_form($id, $ty
       '#suffix' => '</tr>',
     );
     $form['attributes'][$aid]['name'] = array(
-      '#value' => $attribute->name,
+      '#value' => t($attribute->name),
     );
     $form['attributes'][$aid]['aid'] = array(
       '#type' => 'hidden',
@@ -937,7 +937,7 @@ function uc_object_options_form($id, $ty
         $form['attributes'][$aid]['options'][$oid]['select'] = array(
           '#type' => 'checkbox',
           '#default_value' => isset($attribute->options[$oid]) ? TRUE : FALSE,
-          '#title' => $option->name,
+          '#title' => t($option->name),
         );
         $form['attributes'][$aid]['options'][$oid]['cost'] = array(
           '#type' => 'textfield',
@@ -1140,7 +1140,7 @@ function uc_product_adjustments_form($ni
     $query_where .= " ao$i.aid = ". $prod_attr->aid ." AND";
     $query_order .= " po$i.ordering, ao$i.name,";
     ++$i;
-    $attribute_names .= '<th>'. $prod_attr->name .'</th>';
+    $attribute_names .= '<th>'. t($prod_attr->name) .'</th>';
     $attribute_ids[] = $prod_attr->aid;
   }
 
@@ -1189,7 +1189,7 @@ function uc_product_adjustments_form($ni
       $row_title = '';
       $comb_array = array();
       for ($j = 1; $j <= $num_prod_attr; ++$j) {
-        $cells .= '<td>'. $combo->{'name'.$j} .'</td>';
+        $cells .= '<td>'. t($combo->{'name'.$j}) .'</td>';
         $row_title .= $combo->{'name'.$j} .', ';
         $comb_array[$combo->{'aid'.$j}] = $combo->{'oid'.$j};
       }
@@ -1313,8 +1313,10 @@ function uc_attribute_load($attr_id, $ni
   }
   if ($attribute) {
     $attribute->options = array();
+	$attribute->name=t($attribute->name);
     while ($option = db_fetch_object($result)) {
       $attribute->options[$option->oid] = $option;
+	  $attribute->options[$option->oid]->name=t($option->name);
     }
   }
 
@@ -1430,10 +1432,10 @@ function _uc_cart_product_get_options($i
       // Only discrete options can affect the price of an item.
       if ($attribute->display && count($attribute->options)) {
         $options[$aid] = (array)$attribute->options[$oid];
-        $options[$aid]['attribute'] = $attribute->name;
+        $options[$aid]['attribute'] = t($attribute->name);
       }
       else {
-        $options[$aid] = array('attribute' => $attribute->name,
+        $options[$aid] = array('attribute' => t($attribute->name),
           'oid' => 0,
           'name' => check_plain($oid),
           'cost' => 0,
@@ -1486,7 +1488,7 @@ function _uc_attribute_alter_form($produ
             $display_price = '';
             break;
         }
-        $options[$option->oid] = $option->name . $display_price;
+        $options[$option->oid] = t($option->name) . $display_price;
       }
 
       if (count($attribute->options) && $attribute->display > 0) {