diff -bduNr /home/klavs/drupal6/uc_vat-6.x-1.0/uc_vat.module uc_vat/uc_vat.module
--- /home/klavs/drupal6/uc_vat-6.x-1.0/uc_vat.module	2009-10-14 14:28:20.000000000 +0200
+++ uc_vat/uc_vat.module	2010-02-22 13:37:06.000000000 +0100
@@ -85,7 +85,7 @@
   if (uc_product_is_product_form($form)) {
     foreach (array('list_price', 'cost', 'sell_price') as $field) {
       $desc = substr($form['base']['prices'][$field]['#description'], 0, -1) .', ';
-      $desc .= variable_get('uc_vat_'. $field .'_inclusive', FALSE) ? t('including !tax.', array('!tax' => variable_get('uc_vat_name', 'VAT'))) : t('excluding !tax.', array('!tax' => variable_get('uc_vat_name', 'VAT')));
+      $desc .= variable_get('uc_vat_'. $field .'_inclusive', FALSE) ? t('including !tax.', array('!tax' => t(variable_get('uc_vat_name', 'VAT')))) : t('excluding !tax.', array('!tax' => t(variable_get('uc_vat_name', 'VAT'))));
       $form['base']['prices'][$field]['#description'] = $desc;
     }
   }
@@ -95,14 +95,14 @@
   if (_uc_vat_attribute_fields()) {
     $form['vat_note'] = array(
       '#type' => 'markup',
-      '#value' => '<p>'. t('Prices shown here are exclusive of !tax. !tax will be added where applicable when these attributes are added to products.', array('!tax' => variable_get('uc_vat_name', 'VAT'))) .'</p>',
+      '#value' => '<p>'. t('Prices shown here are exclusive of !tax. !tax will be added where applicable when these attributes are added to products.', array('!tax' => t(variable_get('uc_vat_name', 'VAT')))) .'</p>',
     );
   }
 }
 
 function uc_vat_form_uc_attribute_option_form_alter(&$form, $form_state) {
   if (_uc_vat_attribute_fields()) {
-    $form['adjustments']['#description'] .= '<br />'. t('Prices entered must exclude !tax. !tax will be added where applicable when this attribute is added to a product.', array('!tax' => variable_get('uc_vat_name', 'VAT')));
+    $form['adjustments']['#description'] .= '<br />'. t('Prices entered must exclude !tax. !tax will be added where applicable when this attribute is added to a product.', array('!tax' => t(variable_get('uc_vat_name', 'VAT'))));
   }
 }
 
@@ -111,7 +111,7 @@
  */
 function uc_vat_form_uc_object_options_form_alter(&$form, $form_state) {
   // Add VAT inclusive/exclusive message.
-  $name = variable_get('uc_vat_name', 'VAT');
+  $name = t(variable_get('uc_vat_name', 'VAT'));
   $message = variable_get('uc_vat_cost_inclusive', FALSE) ? t('"Cost" column includes !tax.', array('!tax' => $name)) : t('"Cost" column excludes !tax.', array('!tax' => $name));
   $message .= ' ';
   $message .= variable_get('uc_vat_sell_price_inclusive', FALSE) ? t('"Price" column includes !tax.', array('!tax' => $name)) : t('"Price" column excludes !tax.', array('!tax' => $name));
@@ -176,14 +176,14 @@
   if ($form['id']['#value'] && _uc_vat_product_fields()) {
     if (variable_get('uc_vat_recalculate_prices', FALSE)) {
       $form['recalculation_note'] = array(
-        '#value' => '<p>'. t('If the rate is changed, product and attribute prices will be recalculated, so !tax exclusive prices will change but !tax inclusive prices will stay the same. Visit the <a href="!url">VAT settings</a> page to change this behaviour.', array('!tax' => variable_get('uc_vat_name', 'VAT'), '!url' => url('admin/store/settings/taxes/vat'))) .'</p>',
+        '#value' => '<p>'. t('If the rate is changed, product and attribute prices will be recalculated, so !tax exclusive prices will change but !tax inclusive prices will stay the same. Visit the <a href="!url">VAT settings</a> page to change this behaviour.', array('!tax' => t(variable_get('uc_vat_name', 'VAT')), '!url' => url('admin/store/settings/taxes/vat'))) .'</p>',
         '#weight' => -10,
       );
       $form['#submit'][] = 'uc_vat_recalculate_prices';
     }
     else {
       $form['recalculation_note'] = array(
-        '#value' => '<p>'. t('If the rate is changed, product and attribute prices will not be recalculated, so !tax inclusive prices will change. Visit the <a href="!url">VAT settings</a> page to change this behaviour.', array('!tax' => variable_get('uc_vat_name', 'VAT'), '!url' => url('admin/store/settings/taxes/vat'))) .'</p>',
+        '#value' => '<p>'. t('If the rate is changed, product and attribute prices will not be recalculated, so !tax inclusive prices will change. Visit the <a href="!url">VAT settings</a> page to change this behaviour.', array('!tax' => t(variable_get('uc_vat_name', 'VAT')), '!url' => url('admin/store/settings/taxes/vat'))) .'</p>',
         '#weight' => -10,
       );
     }
@@ -447,7 +447,7 @@
         $options['suffixes'][] = '<span class="price-vat-suffix"> '. t('including !taxes', array('!taxes' => implode(', ', $suffixes))) .'</span>';
       }
       else {
-        $options['suffixes'][] = '<span class="price-vat-suffix"> '. t('excluding !tax', array('!tax' => variable_get('uc_vat_name', 'VAT'))) .'</span>';
+        $options['suffixes'][] = '<span class="price-vat-suffix"> '. t('excluding !tax', array('!tax' => t(variable_get('uc_vat_name', 'VAT')))) .'</span>';
       }
     }
     if (variable_get('uc_vat_suffix_shipping', FALSE) && $node->shippable) {
@@ -547,14 +547,14 @@
       case 'cart-preview':
         drupal_add_js("if (Drupal.jsEnabled) { \$(document).ready(function() {
           if (window.set_line_item) {
-            set_line_item('tax_subtotal', '". t('Subtotal excluding !tax', array('!tax' => variable_get('uc_vat_name', 'VAT'))) ."', ". $amount .", ". variable_get('uc_li_tax_subtotal_weight', 8) .");
+            set_line_item('tax_subtotal', '". t('Subtotal excluding !tax', array('!tax' => t(variable_get('uc_vat_name', 'VAT')))) ."', ". $amount .", ". variable_get('uc_li_tax_subtotal_weight', 8) .");
           }
         })};", 'inline');
       break;
       case 'load':
         return array(array(
           'id' => 'tax_subtotal',
-          'title' => t('Subtotal excluding !tax', array('!tax' => variable_get('uc_vat_name', 'VAT'))),
+          'title' => t('Subtotal excluding !tax', array('!tax' => t(variable_get('uc_vat_name', 'VAT')))),
           'amount' => $amount,
           'weight' => variable_get('uc_li_tax_subtotal_weight', 7),
         ));
@@ -621,7 +621,7 @@
   $taxes = uc_taxes_rate_load();
   $subtotal = 0;
 
-  $tax_name = variable_get('uc_vat_name', 'VAT');
+  $tax_name = t(variable_get('uc_vat_name', 'VAT'));
   if (count($taxes) == 1) {
     $tax = reset($taxes);
     $tax_name = $tax->name;
@@ -636,8 +636,8 @@
     $header[] = array('data' => t('incl. !tax', array('!tax' => $tax_name)), 'class' => 'price vat', 'style' => 'white-space: nowrap;');
   }
   else {
-    $header[] = array('data' => t('Price excl. !tax', array('!tax' => variable_get('uc_vat_name', 'VAT'))), 'class' => 'price excl-vat', 'style' => 'white-space: nowrap;');
-    $header[] = array('data' => $tax_name, 'class' => 'price vat');
+    $header[] = array('data' => t('Price excl. !tax', array('!tax' => t(variable_get('uc_vat_name', 'VAT')))), 'class' => 'price excl-vat', 'style' => 'white-space: nowrap;');
+    $header[] = array('data' => t("$tax_name"), 'class' => 'price vat');
   }
   $header[] = array('data' => t('Price'), 'class' => 'price');